diff options
author | Harald Musum <musum@yahooinc.com> | 2023-10-12 19:43:26 +0200 |
---|---|---|
committer | Harald Musum <musum@yahooinc.com> | 2023-10-12 19:43:26 +0200 |
commit | bd6a5ba164c02abe5a69cc256f9c43b4d425be0e (patch) | |
tree | db85a5b07053d219261fe662a91efd6bbcb3531c /standalone-container | |
parent | 052c6021d3d33f19be93a53c5fb95a02895889d6 (diff) |
Support documented VESPA_CONFIGSERVER_ZOOKEEPER_BARRIER_TIMEOUT env variable
Diffstat (limited to 'standalone-container')
-rw-r--r-- | standalone-container/src/main/java/com/yahoo/container/standalone/CloudConfigInstallVariables.java | 4 |
1 files changed, 3 insertions, 1 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 3bdba2e6bcd..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 @@ -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 |