1 files changed, 5 insertions, 7 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
index 4bbb8a63974..b617ea71881 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java
@@ -36,6 +36,7 @@ import com.yahoo.vespa.curator.transaction.CuratorOperations;
 import com.yahoo.vespa.curator.transaction.CuratorTransaction;
 import org.apache.zookeeper.data.Stat;
 import java.security.cert.X509Certificate;
+import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
 import java.util.Optional;
@@ -68,6 +69,8 @@ public class SessionZooKeeperClient {
     private static final String OPERATOR_CERTIFICATES_PATH = "operatorCertificates";
     private static final String CLOUD_ACCOUNT_PATH = "cloudAccount";
 
+    private static final Duration barrierWaitForAll = Duration.ofSeconds(1);
+
     private final Curator curator;
     private final TenantName tenantName;
     private final long sessionId;
@@ -132,17 +135,12 @@ public class SessionZooKeeperClient {
         return sessionPath.append(barrierName);
     }
 
-    /** Returns the number of node members needed in a barrier */
-    private int getNumberOfMembers() {
-        return (curator.zooKeeperEnsembleCount() / 2) + 1; // majority
-    }
-
     private CompletionWaiter createCompletionWaiter(String waiterNode) {
-        return curator.createCompletionWaiter(sessionPath, waiterNode, getNumberOfMembers(), serverId);
+        return curator.createCompletionWaiter(sessionPath, waiterNode, serverId, barrierWaitForAll);
     }
 
     private CompletionWaiter getCompletionWaiter(Path path) {
-        return curator.getCompletionWaiter(path, getNumberOfMembers(), serverId);
+        return curator.getCompletionWaiter(path, serverId, barrierWaitForAll);
     }
 
     /** Returns a transaction deleting this session on commit */