diff options
| author | Martin Polden <mpolden@mpolden.no> | 2020-12-04 09:32:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-12-04 09:32:08 +0100 |
| commit | 555200c6f53a4ddb579181cac50a950c5647d854 (patch) | |
| tree | c32c9d639a6d42c4c5ca3551cbe22bd19f387622 /zookeeper-server | |
| parent | 2b65848f387b2702bfc9ad9e0f1648333b8a9472 (diff) | |
| parent | 299cbfb128f75697c0943be74d0b157268ea6fb4 (diff) | |
Merge pull request #15657 from vespa-engine/hmuusm/set-skipACL
Skip ACL checks to enable reconfiguration of servers
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 ee619727b75..001926346f2 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 @@ -92,6 +92,7 @@ public class Configurator { sb.append("quorumListenOnAllIPs=true").append("\n"); sb.append("standaloneEnabled=false").append("\n"); sb.append("reconfigEnabled=true").append("\n"); + sb.append("skipACL=yes").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 0356407da3e..8078935601b 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 @@ -177,7 +177,8 @@ public class ConfiguratorTest { "serverCnxnFactory=org.apache.zookeeper.server.NettyServerCnxnFactory\n" + "quorumListenOnAllIPs=true\n" + "standaloneEnabled=false\n" + - "reconfigEnabled=true\n"; + "reconfigEnabled=true\n" + + "skipACL=yes\n"; } private String quorumKeyStoreAndTrustStoreConfig(File jksKeyStoreFilePath, File caCertificatesFilePath) { |