Merge pull request #27227 from vespa-engine/balder/drop-lock-when-calling-cancelv8.168.43

Prevent possible deadlock when calling State::cancel by dropping the …

1 files changed, 9 insertions, 5 deletions

diff --git a/searchcore/src/vespa/searchcore/proton/common/scheduled_forward_executor.cpp b/searchcore/src/vespa/searchcore/proton/common/scheduled_forward_executor.cpp
index f19ff36dbfb..230ff922e80 100644
--- a/searchcore/src/vespa/searchcore/proton/common/scheduled_forward_executor.cpp
+++ b/searchcore/src/vespa/searchcore/proton/common/scheduled_forward_executor.cpp
@@ -95,11 +95,15 @@ ScheduledForwardExecutor::~ScheduledForwardExecutor() {
 bool
 ScheduledForwardExecutor::cancel(uint64_t key)
 {
-    std::lock_guard guard(_lock);
-    auto found = _taskList.find(key);
-    if (found == _taskList.end()) return false;
-    found->second->cancel();
-    _taskList.erase(found);
+    std::unique_ptr<State> state;
+    {
+        std::lock_guard guard(_lock);
+        auto found = _taskList.find(key);
+        if (found == _taskList.end()) return false;
+        state = std::move(found->second);
+        _taskList.erase(found);
+    }
+    state->cancel();
     return true;
 }