diff options
| author | Harald Musum <musum@verizonmedia.com> | 2019-12-13 17:59:18 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2019-12-13 17:59:18 +0100 |
| commit | 30c58210006071b6d571e63b8a896c63dc7d9714 (patch) | |
| tree | 6798ba545422596f335b3ed12a854a0dab892c1e | |
| parent | b768528236e416b905f34b611e10dbafdf8b5733 (diff) | |
| parent | 10fffc057043d0bf11de3b63b417b2cbe0c88a66 (diff) | |
Merge pull request #11557 from vespa-engine/hmusum/configure-zk-secure-client-port
Configure secure client port
3 files changed, 3 insertions, 0 deletions
diff --git a/configdefinitions/src/vespa/zookeeper-server.def b/configdefinitions/src/vespa/zookeeper-server.def index c44fec00aa3..483e772b818 100644 --- a/configdefinitions/src/vespa/zookeeper-server.def +++ b/configdefinitions/src/vespa/zookeeper-server.def @@ -16,6 +16,7 @@ maxClientConnections int default=0 dataDir string default="var/zookeeper" clientPort int default=2181 +secureClientPort int default=2184 snapshotCount int default=50000 # Purge interval in hours diff --git a/zookeeper-server/zookeeper-server-3.5/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java b/zookeeper-server/zookeeper-server-3.5/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java index a1ab14b834c..b8a96d916f5 100644 --- a/zookeeper-server/zookeeper-server-3.5/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java +++ b/zookeeper-server/zookeeper-server-3.5/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImpl.java @@ -99,6 +99,7 @@ public class VespaZooKeeperServerImpl extends AbstractComponent implements Runna sb.append("snapCount=").append(config.snapshotCount()).append("\n"); sb.append("dataDir=").append(getDefaults().underVespaHome(config.dataDir())).append("\n"); sb.append("clientPort=").append(config.clientPort()).append("\n"); + sb.append("secureClientPort=").append(config.secureClientPort()).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.5.5/zookeeperAdmin.html#sc_zkCommands diff --git a/zookeeper-server/zookeeper-server-3.5/src/test/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImplTest.java b/zookeeper-server/zookeeper-server-3.5/src/test/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImplTest.java index 19166047fb1..0981ae615df 100644 --- a/zookeeper-server/zookeeper-server-3.5/src/test/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImplTest.java +++ b/zookeeper-server/zookeeper-server-3.5/src/test/java/com/yahoo/vespa/zookeeper/VespaZooKeeperServerImplTest.java @@ -176,6 +176,7 @@ public class VespaZooKeeperServerImplTest { "snapCount=50000\n" + "dataDir=" + getDefaults().underVespaHome("var/zookeeper") + "\n" + "clientPort=2181\n" + + "secureClientPort=2184\n" + "autopurge.purgeInterval=1\n" + "autopurge.snapRetainCount=15\n" + "4lw.commands.whitelist=conf,cons,crst,dirs,dump,envi,mntr,ruok,srst,srvr,stat,wchs\n" + |