diff options
author | Arnstein Ressem <aressem@verizonmedia.com> | 2020-11-13 13:45:06 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-11-13 13:45:06 +0100 |
commit | b74bab0726650cafe620037413a96131a8cc443f (patch) | |
tree | 61721a9f09d8d5266ef200ae70c178f0a124a07c | |
parent | 7b7c8bb06c52836ddb06bb39c9c1b66b9c58f4ce (diff) | |
parent | feeafec79b1973cfef9508fdb986128c44a6bef9 (diff) |
Merge pull request #15337 from vespa-engine/revert-15332-hmusum/set-standaloneEnabled-to-false
Revert "Do not run in standalone compatibility mode for single ZooKeeper servers"
2 files changed, 2 insertions, 4 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 d92b80b5b81..44ea8cece34 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,7 +90,6 @@ 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 d73fbab8f64..3838b10d914 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 Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. +// Copyright 2017 Yahoo Holdings. 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,8 +175,7 @@ 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" + - "standaloneEnabled=false\n"; + "quorumListenOnAllIPs=true\n"; } private String quorumKeyStoreAndTrustStoreConfig(File jksKeyStoreFilePath, File caCertificatesFilePath) { |