Add guard against lockstep wait in ApplyBucketDiffState::wait().

Add guard against throwing exception out of ApplyBucketDiffState destructor.

1 files changed, 7 insertions, 1 deletions

diff --git a/storage/src/vespa/storage/persistence/apply_bucket_diff_state.cpp b/storage/src/vespa/storage/persistence/apply_bucket_diff_state.cpp
index 4fe24895c54..c754796ba51 100644
--- a/storage/src/vespa/storage/persistence/apply_bucket_diff_state.cpp
+++ b/storage/src/vespa/storage/persistence/apply_bucket_diff_state.cpp
@@ -17,7 +17,10 @@ ApplyBucketDiffState::ApplyBucketDiffState(const MergeBucketInfoSyncer& merge_bu
 ApplyBucketDiffState::~ApplyBucketDiffState()
 {
     wait();
-    sync_bucket_info();
+    try {
+        sync_bucket_info();
+    } catch (std::exception&) {
+    } 
 }
 
 bool
@@ -29,6 +32,9 @@ ApplyBucketDiffState::empty() const
 void
 ApplyBucketDiffState::wait()
 {
+    if (!_async_results.empty()) {
+        _async_results.back().wait();
+    }
     for (auto &result_to_check : _async_results) {
         result_to_check.wait();
     }