diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-05-21 13:48:50 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2022-05-21 13:48:50 +0200 |
commit | 2c34544abef32f7da1c05a83a3648532afb53186 (patch) | |
tree | 8d49676b4ebd46de374492c371250c7323556fe2 | |
parent | 1f8d7686765b7a6db9db4796af1a2cf2e10d7056 (diff) | |
parent | 1a3702e845352a85c96d3c1bde1353936595143f (diff) |
Merge pull request #22693 from vespa-engine/havardpe/hold-lock-while-modifying-merge-states-map
hold lock while modifying merge states map
-rw-r--r-- | storage/src/vespa/storage/persistence/filestorage/filestorhandlerimpl.cpp | 8 |
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(); } } |