summaryrefslogtreecommitdiffstats
path: root/configserver/src
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-10-19 10:01:45 +0200
committerHarald Musum <musum@verizonmedia.com>2020-10-19 10:01:45 +0200
commit6411bc37b6a7000ffadbd13fb1ea7b53dedca47d (patch)
tree2bbd5c34f7db9c58d4c7fbb08d782081085b8e8a /configserver/src
parent3d89f85313a0a8da5d8ad0e435b1877a46e6ecc3 (diff)
Use deploy timeout in config server to set reservation expiry
Diffstat (limited to 'configserver/src')
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java3
1 files changed, 3 insertions, 0 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
index 8ded1f4c573..157e1bd838c 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ApplicationRepository.java
@@ -993,6 +993,9 @@ public class ApplicationRepository implements com.yahoo.config.provision.Deploye
.sum();
}
+ @Override
+ public Duration serverDeployTimeout() { return Duration.ofSeconds(configserverConfig.zookeeper().barrierTimeout()); }
+
private static void logConfigChangeActions(ConfigChangeActions actions, DeployLogger logger) {
RestartActions restartActions = actions.getRestartActions();
if ( ! restartActions.isEmpty()) {