hold lock while modifying merge states map

1 files changed, 6 insertions, 2 deletions

diff --git a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
index 0f897d753f6..cfcc32a76e5 100644
--- a/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
+++ b/storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp
@@ -173,8 +173,13 @@ FileStorHandlerImpl::flush(bool killPendingMerges)
     LOG(debug, "All queues and bucket locks released.");
 
     if (killPendingMerges) {
+        std::map<document::Bucket, std::shared_ptr<MergeStatus>> my_merge_states;
+        {
+            std::lock_guard mergeGuard(_mergeStatesLock);
+            std::swap(_mergeStates, my_merge_states);
+        }
         api::ReturnCode code(api::ReturnCode::ABORTED, "Storage node is shutting down");
-        for (auto & entry : _mergeStates) {
+        for (auto & entry : my_merge_states) {
             MergeStatus& s(*entry.second);
             if (s.pendingGetDiff) {
                 s.pendingGetDiff->setResult(code);
@@ -189,7 +194,6 @@ FileStorHandlerImpl::flush(bool killPendingMerges)
                 _messageSender.sendReply(s.reply);
             }
         }
-        _mergeStates.clear();
     }
 }