Add config for barrierWaitForAllTimeout

3 files changed, 10 insertions, 12 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
index 91f24be3da3..d33dcea5c69 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionPreparer.java
@@ -13,7 +13,6 @@ import com.yahoo.config.application.api.ApplicationPackage;
 import com.yahoo.config.application.api.DeployLogger;
 import com.yahoo.config.application.api.DeploymentInstanceSpec;
 import com.yahoo.config.application.api.FileRegistry;
-import com.yahoo.config.application.api.xml.DeploymentSpecXmlReader;
 import com.yahoo.config.model.api.ConfigDefinitionRepo;
 import com.yahoo.config.model.api.ContainerEndpoint;
 import com.yahoo.config.model.api.EndpointCertificateMetadata;
@@ -32,7 +31,6 @@ import com.yahoo.config.provision.Zone;
 import com.yahoo.container.jdisc.secretstore.SecretStore;
 import com.yahoo.net.HostName;
 import com.yahoo.path.Path;
-import com.yahoo.text.XML;
 import com.yahoo.vespa.config.server.ConfigServerSpec;
 import com.yahoo.vespa.config.server.TimeoutBudget;
 import com.yahoo.vespa.config.server.application.ApplicationSet;
@@ -53,7 +51,6 @@ import com.yahoo.vespa.curator.Curator;
 import com.yahoo.vespa.flags.FlagSource;
 import com.yahoo.vespa.model.application.validation.BundleValidator;
 import org.xml.sax.SAXException;
-
 import javax.xml.parsers.ParserConfigurationException;
 import javax.xml.transform.TransformerException;
 import java.io.File;
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 fa528ded54d..ff661fbcc74 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
@@ -892,7 +892,7 @@ public class SessionRepository {
         return new SessionZooKeeperClient(curator,
                                           tenantName,
                                           sessionId,
-                                          configserverConfig.serverId(),
+                                          configserverConfig,
                                           fileDistributionFactory.createFileManager(getSessionAppDir(sessionId)),
                                           maxNodeSize);
     }
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 b617ea71881..87793f526bd 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
@@ -1,6 +1,7 @@
 // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.config.server.session;
 
+import com.yahoo.cloud.config.ConfigserverConfig;
 import com.yahoo.component.Version;
 import com.yahoo.component.Vtag;
 import com.yahoo.config.FileReference;
@@ -69,8 +70,6 @@ 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;
@@ -79,21 +78,23 @@ public class SessionZooKeeperClient {
     private final String serverId;  // hostname
     private final int maxNodeSize;
     private final AddFileInterface fileManager;
+    private final Duration barrierWaitForAllTimeout;
 
-    public SessionZooKeeperClient(Curator curator, TenantName tenantName, long sessionId, String serverId, AddFileInterface fileManager, int maxNodeSize) {
+    public SessionZooKeeperClient(Curator curator, TenantName tenantName, long sessionId, ConfigserverConfig configserverConfig, AddFileInterface fileManager, int maxNodeSize) {
         this.curator = curator;
         this.tenantName = tenantName;
         this.sessionId = sessionId;
         this.sessionPath = getSessionPath(tenantName, sessionId);
-        this.serverId = serverId;
+        this.serverId = configserverConfig.serverId();
         this.sessionStatusPath = sessionPath.append(ZKApplication.SESSIONSTATE_ZK_SUBPATH);
         this.maxNodeSize = maxNodeSize;
         this.fileManager = fileManager;
+        this.barrierWaitForAllTimeout = Duration.ofSeconds(configserverConfig.barrierWaitForAllTimeout());
     }
 
     // For testing only
-    public SessionZooKeeperClient(Curator curator, TenantName tenantName, long sessionId, String serverId) {
-        this(curator, tenantName, sessionId, serverId, new MockFileManager(), 10 * 1024 * 1024);
+    public SessionZooKeeperClient(Curator curator, TenantName tenantName, long sessionId, ConfigserverConfig configserverConfig) {
+        this(curator, tenantName, sessionId, configserverConfig, new MockFileManager(), 10 * 1024 * 1024);
     }
 
     public void writeStatus(Session.Status sessionStatus) {
@@ -136,11 +137,11 @@ public class SessionZooKeeperClient {
     }
 
     private CompletionWaiter createCompletionWaiter(String waiterNode) {
-        return curator.createCompletionWaiter(sessionPath, waiterNode, serverId, barrierWaitForAll);
+        return curator.createCompletionWaiter(sessionPath, waiterNode, serverId, barrierWaitForAllTimeout);
     }
 
     private CompletionWaiter getCompletionWaiter(Path path) {
-        return curator.getCompletionWaiter(path, serverId, barrierWaitForAll);
+        return curator.getCompletionWaiter(path, serverId, barrierWaitForAllTimeout);
     }
 
     /** Returns a transaction deleting this session on commit */