diff options
author | Martin Polden <mpolden@mpolden.no> | 2020-11-16 10:40:30 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-16 10:40:30 +0100 |
commit | c8ab5da6080dc4b9e6d5441767fa99bed89d3d9d (patch) | |
tree | 54c0ff0ad68fb0d71e046418fb7c90e9ebf9214e | |
parent | ce7aa6067ea6f8f3fa2ec42214f64d158acca931 (diff) | |
parent | 23d2bde447c894ba9bf075f960b78701f018ee84 (diff) |
Merge pull request #15350 from vespa-engine/hmusum/set-reconfigEnabled-to-true
Set reconfigEnabled for zookeeper to true
2 files changed, 6 insertions, 6 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 7424b1750c4..ee619727b75 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 @@ -91,6 +91,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"); ensureThisServerIsRepresented(config.myid(), config.server()); config.server().forEach(server -> addServerToCfg(sb, server)); SSLContext sslContext = new SslContextBuilder().build(); 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 2b2016460b8..0356407da3e 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 @@ -55,8 +55,6 @@ public class ConfiguratorTest { @Test public void config_is_written_correctly_when_one_server() throws IOException { ZookeeperServerConfig.Builder builder = createConfigBuilderForSingleHost(cfgFile, idFile, jksKeyStoreFile); - builder.myidFile(idFile.getAbsolutePath()); - builder.myid(0); new Configurator(builder.build()).writeConfigToDisk(Optional.empty()); validateConfigFileSingleHost(cfgFile); validateIdFile(idFile, "0\n"); @@ -80,7 +78,7 @@ public class ConfiguratorTest { public void config_is_written_correctly_with_tls_for_quorum_communication_port_unification() throws IOException { ZookeeperServerConfig.Builder builder = createConfigBuilderForSingleHost(cfgFile, idFile, jksKeyStoreFile); builder.tlsForQuorumCommunication(TlsForQuorumCommunication.PORT_UNIFICATION); - builder.tlsForClientServerCommunication(TlsForClientServerCommunication.Enum.PORT_UNIFICATION); + builder.tlsForClientServerCommunication(TlsForClientServerCommunication.PORT_UNIFICATION); Optional<TransportSecurityOptions> transportSecurityOptions = createTransportSecurityOptions(); new Configurator(builder.build()).writeConfigToDisk(transportSecurityOptions); validateConfigFilePortUnification(cfgFile, jksKeyStoreFile, transportSecurityOptions.get().getCaCertificatesFile().get().toFile()); @@ -91,7 +89,7 @@ public class ConfiguratorTest { public void config_is_written_correctly_with_tls_for_quorum_communication_tls_with_port_unification() throws IOException { ZookeeperServerConfig.Builder builder = createConfigBuilderForSingleHost(cfgFile, idFile, jksKeyStoreFile); builder.tlsForQuorumCommunication(TlsForQuorumCommunication.TLS_WITH_PORT_UNIFICATION); - builder.tlsForClientServerCommunication(TlsForClientServerCommunication.Enum.TLS_WITH_PORT_UNIFICATION); + builder.tlsForClientServerCommunication(TlsForClientServerCommunication.TLS_WITH_PORT_UNIFICATION); Optional<TransportSecurityOptions> transportSecurityOptions = createTransportSecurityOptions(); new Configurator(builder.build()).writeConfigToDisk(transportSecurityOptions); validateConfigFileTlsWithPortUnification(cfgFile, jksKeyStoreFile, transportSecurityOptions.get().getCaCertificatesFile().get().toFile()); @@ -102,7 +100,7 @@ public class ConfiguratorTest { public void config_is_written_correctly_with_tls_for_quorum_communication_tls_only() throws IOException { ZookeeperServerConfig.Builder builder = createConfigBuilderForSingleHost(cfgFile, idFile, jksKeyStoreFile); builder.tlsForQuorumCommunication(TlsForQuorumCommunication.TLS_ONLY); - builder.tlsForClientServerCommunication(TlsForClientServerCommunication.Enum.TLS_ONLY); + builder.tlsForClientServerCommunication(TlsForClientServerCommunication.TLS_ONLY); Optional<TransportSecurityOptions> transportSecurityOptions = createTransportSecurityOptions(); new Configurator(builder.build()).writeConfigToDisk(transportSecurityOptions); validateConfigFileTlsOnly(cfgFile, jksKeyStoreFile, transportSecurityOptions.get().getCaCertificatesFile().get().toFile()); @@ -178,7 +176,8 @@ public class ConfiguratorTest { "admin.enableServer=false\n" + "serverCnxnFactory=org.apache.zookeeper.server.NettyServerCnxnFactory\n" + "quorumListenOnAllIPs=true\n" + - "standaloneEnabled=false\n"; + "standaloneEnabled=false\n" + + "reconfigEnabled=true\n"; } private String quorumKeyStoreAndTrustStoreConfig(File jksKeyStoreFilePath, File caCertificatesFilePath) { |