aboutsummaryrefslogtreecommitdiffstats
path: root/zkfacade/src/main
diff options
context:
space:
mode:
authorHarald Musum <musum@oath.com>2018-10-24 08:23:01 +0200
committerHarald Musum <musum@oath.com>2018-10-24 08:23:01 +0200
commitcd4a8d0fc149af0e27f0ffdfd99df35cce4a7592 (patch)
tree0c9488abe78fd383c341b71aa2f98a7735de7b7c /zkfacade/src/main
parent3f6ee1763741cdb5f3148931883d665f58adcfb1 (diff)
Whitelist ZooKeeper four letter commands
Diffstat (limited to 'zkfacade/src/main')
-rw-r--r--zkfacade/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java4
1 files changed, 4 insertions, 0 deletions
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java b/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java
index 405afcd3c39..c42c1793c41 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperServer.java
@@ -83,6 +83,10 @@ public class ZooKeeperServer extends AbstractComponent implements Runnable {
sb.append("clientPort=").append(config.clientPort()).append("\n");
sb.append("autopurge.purgeInterval=").append(config.autopurge().purgeInterval()).append("\n");
sb.append("autopurge.snapRetainCount=").append(config.autopurge().snapRetainCount()).append("\n");
+ // See http://zookeeper.apache.org/doc/r3.4.13/zookeeperAdmin.html#sc_zkCommands
+ // Includes all available commands in 3.4, except 'wchc' and 'wchp'
+ // Mandatory when using ZooKeeper 3.5
+ sb.append("4lw.commands.whitelist=conf,cons,crst,dump,envi,mntr,ruok,srst,srvr,stat,wchs").append("\n");
if (config.server().size() > 1) {
ensureThisServerIsRepresented(config.myid(), config.server());
for (ZookeeperServerConfig.Server server : config.server()) {