diff options
| author | jonmv <venstad@gmail.com> | 2023-12-06 09:59:38 +0100 |
|---|---|---|
| committer | jonmv <venstad@gmail.com> | 2023-12-06 09:59:38 +0100 |
| commit | 891c9170a629ff6b598333cd4a981f2b0d74aa06 (patch) | |
| tree | ba593eb88603f74fcc6a49efc755aa9af7c2be99 | |
| parent | 97d05605024170054ec9594a872f0cf11b45cff0 (diff) | |
Use 3.9.1 as default in ZK version flag
| -rw-r--r-- | flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java | 2 | ||||
| -rw-r--r-- | zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java index 1c4e13cf44b..e8b90a8cab6 100644 --- a/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java +++ b/flags/src/main/java/com/yahoo/vespa/flags/PermanentFlags.java @@ -168,7 +168,7 @@ public class PermanentFlags { HOSTNAME, NODE_TYPE, TENANT_ID, INSTANCE_ID, CLUSTER_TYPE, CLUSTER_ID, VESPA_VERSION); public static final UnboundStringFlag ZOOKEEPER_SERVER_VERSION = defineStringFlag( - "zookeeper-server-version", "3.8.0", + "zookeeper-server-version", "3.9.1", "ZooKeeper server version, a jar file zookeeper-server-<ZOOKEEPER_SERVER_VERSION>-jar-with-dependencies.jar must exist", "Takes effect on restart of Docker container", NODE_TYPE, INSTANCE_ID, HOSTNAME); diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java index 34814fab584..727e369885e 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java @@ -140,6 +140,7 @@ public class Configurator { } } + static Map<String, String> getServerConfig(List<ZookeeperServerConfig.Server> serversConfig, int joinerId) { Map<String, String> configEntries = new LinkedHashMap<>(); for (Server server : serversConfig) { |