Merge pull request #22385 from vespa-engine/vekterli/require-state-lock-before-checking-fields

Reacquire state lock before checking if any fields were set by the state listener

1 files changed, 3 insertions, 2 deletions

diff --git a/storage/src/vespa/storage/storageserver/statemanager.cpp b/storage/src/vespa/storage/storageserver/statemanager.cpp
index 7cb66ab447f..60aebf5a535 100644
--- a/storage/src/vespa/storage/storageserver/statemanager.cpp
+++ b/storage/src/vespa/storage/storageserver/statemanager.cpp
@@ -272,8 +272,9 @@ StateManager::notifyStateListeners()
         }
         for (auto* listener : _stateListeners) {
             listener->handleNewState();
-                // If one of them actually altered the state again, abort
-                // sending events, update states and send new one to all.
+            // If one of them actually altered the state again, abort
+            // sending events, update states and send new one to all.
+            std::lock_guard guard(_stateLock);
             if (_nextNodeState || _nextSystemState) {
                 break;
             }