diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-11-13 11:33:20 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-11-13 11:33:20 +0100 |
commit | 56b6fd36f603c740e6e9e4196ce286b6b677d7a6 (patch) | |
tree | 28a0cd16dececa35043f7e61fd791566a71faae8 /zookeeper-server/zookeeper-server-common/src | |
parent | 206a3cea1731524d16ef61cd45068738f92c3c82 (diff) |
Do not run in standalone compatibility mode for single ZooKeeper servers
Always run in distrbuted mode, allows cluster to grow, and old setting
is deprecated
Diffstat (limited to 'zookeeper-server/zookeeper-server-common/src')
2 files changed, 4 insertions, 2 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 44ea8cece34..d92b80b5b81 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 @@ -90,6 +90,7 @@ public class Configurator { // Need NettyServerCnxnFactory to be able to use TLS for communication sb.append("serverCnxnFactory=org.apache.zookeeper.server.NettyServerCnxnFactory").append("\n"); sb.append("quorumListenOnAllIPs=true").append("\n"); + sb.append("standaloneEnabled=false").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 3838b10d914..d73fbab8f64 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 @@ -1,4 +1,4 @@ -// Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.zookeeper; import com.yahoo.cloud.config.ZookeeperServerConfig; @@ -175,7 +175,8 @@ public class ConfiguratorTest { "4lw.commands.whitelist=conf,cons,crst,dirs,dump,envi,mntr,ruok,srst,srvr,stat,wchs\n" + "admin.enableServer=false\n" + "serverCnxnFactory=org.apache.zookeeper.server.NettyServerCnxnFactory\n" + - "quorumListenOnAllIPs=true\n"; + "quorumListenOnAllIPs=true\n" + + "standaloneEnabled=false\n"; } private String quorumKeyStoreAndTrustStoreConfig(File jksKeyStoreFilePath, File caCertificatesFilePath) { |