diff options
Diffstat (limited to 'standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java')
-rw-r--r-- | standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java b/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java index 74aacceaf9e..535d0ae7d78 100644 --- a/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java +++ b/standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java @@ -1,4 +1,4 @@ -// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.container.standalone; import com.yahoo.vespa.model.container.configserver.option.CloudConfigOptions; @@ -46,7 +46,9 @@ public class CloudConfigInstallVariables implements CloudConfigOptions { @Override public Optional<Long> zookeeperBarrierTimeout() { - return getInstallVariable("zookeeper_barrier_timeout", Long::parseLong); + return Optional.ofNullable(System.getenv("VESPA_CONFIGSERVER_ZOOKEEPER_BARRIER_TIMEOUT")) + .map(Long::parseLong) + .or(() -> getInstallVariable("zookeeper_barrier_timeout", Long::parseLong)); } @Override |