diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-12-09 10:26:32 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-12-09 10:26:32 +0100 |
commit | 78e73393f40a724bcc3c5ce0c884cb7cc6809f0c (patch) | |
tree | cd76e8b75dcfe358a70087bff12c06d59054a3a1 /zookeeper-server | |
parent | d1f0faa718a3bd085e6f45adb5013d0c73d520b0 (diff) |
Set reconfigEnabled based on config value
Seeing issues with this for clustercontrollers when cluster grows or
shrinks, so set reconfigEnabled to true only when config says we
should use it
Diffstat (limited to 'zookeeper-server')
2 files changed, 3 insertions, 1 deletions
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 df4b4e76c0b..0e3f3743c18 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 @@ -90,7 +90,7 @@ public class Configurator { sb.append("serverCnxnFactory=org.apache.zookeeper.server.NettyServerCnxnFactory").append("\n"); sb.append("quorumListenOnAllIPs=true").append("\n"); sb.append("standaloneEnabled=false").append("\n"); - sb.append("reconfigEnabled=true").append("\n"); + sb.append("reconfigEnabled=" + config.dynamicReconfiguration()).append("\n"); sb.append("skipACL=yes").append("\n"); ensureThisServerIsRepresented(config.myid(), config.server()); config.server().forEach(server -> addServerToCfg(sb, server, config.clientPort())); diff --git a/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ConfiguratorTest.java b/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ConfiguratorTest.java index a106b6ba99e..04a4010edf8 100644 --- a/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ConfiguratorTest.java +++ b/zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ConfiguratorTest.java @@ -69,6 +69,7 @@ public class ConfiguratorTest { builder.server(newServer(2, "baz", 345, 543)); builder.myidFile(idFile.getAbsolutePath()); builder.myid(1); + builder.dynamicReconfiguration(true); new Configurator(builder.build()).writeConfigToDisk(Optional.empty()); validateConfigFileMultipleHosts(cfgFile); validateIdFile(idFile, "1\n"); @@ -114,6 +115,7 @@ public class ConfiguratorTest { builder.server(newServer(0, "foo", 123, 321)); builder.myid(0); builder.jksKeyStoreFile(jksKeyStoreFile.getAbsolutePath()); + builder.dynamicReconfiguration(true); return builder; } |