Merge pull request #14441 from vespa-engine/hmusum/take-lock-before-deleting

Take lock before deleting

1 files changed, 3 insertions, 1 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
index 6e9e8ab59ff..4f577d8f62c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
@@ -377,7 +377,9 @@ public class SessionRepository {
         remoteSession.deactivate();
         if (localSession == null) {
             // This change will be picked up by directoryCache in this class, which will do the rest of the cleanup
-            remoteSession.delete();
+            try (Lock lock = lock(remoteSession.getSessionId())) {
+                remoteSession.delete();
+            }
         } else {
             deleteLocalSession(localSession);
         }