summaryrefslogtreecommitdiffstats
path: root/zookeeper-server/zookeeper-server-common/src
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-12-04 09:14:06 +0100
committerHarald Musum <musum@verizonmedia.com>2020-12-04 09:14:06 +0100
commit31c5b603ca734a718c5ef9956827b779900b1d30 (patch)
tree0b163eada237345f09632f4d92bbe64439c1ee73 /zookeeper-server/zookeeper-server-common/src
parentb92dbecb261b24568fed1526bd8f925dfc050d1e (diff)
Skip ACL checks to enable reconfiguration of servers
Diffstat (limited to 'zookeeper-server/zookeeper-server-common/src')
-rw-r--r--zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Configurator.java1
-rw-r--r--zookeeper-server/zookeeper-server-common/src/test/java/com/yahoo/vespa/zookeeper/ConfiguratorTest.java3
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..6e407641f3a 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=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 0356407da3e..5a4ab618df2 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=true\n";
}
private String quorumKeyStoreAndTrustStoreConfig(File jksKeyStoreFilePath, File caCertificatesFilePath) {