Read under lock, to ensure up-to-date data

1 files changed, 5 insertions, 3 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java
index b2dbea569b6..0493a8b3c37 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/ApplicationCuratorDatabase.java
@@ -200,9 +200,11 @@ public class ApplicationCuratorDatabase {
     }
 
     public PendingRestarts readPendingRestarts(ApplicationId id) {
-        return curator.getData(pendingRestartsPath(id))
-                      .map(PendingRestartsSerializer::fromBytes)
-                      .orElse(PendingRestarts.empty());
+        try (Lock lock = curator.lock(restartsLockPath(id), Duration.ofMinutes(1))) {
+            return curator.getData(pendingRestartsPath(id))
+                          .map(PendingRestartsSerializer::fromBytes)
+                          .orElse(PendingRestarts.empty());
+        }
     }
 
     public void modifyPendingRestarts(ApplicationId id, UnaryOperator<PendingRestarts> modification) {