diff options
author | Harald Musum <musum@verizonmedia.com> | 2021-05-25 14:31:28 +0200 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2021-05-25 14:31:28 +0200 |
commit | 86f281f57be539ad64238630f21de64726b93b90 (patch) | |
tree | ccfe2a022f58fb88d9134a599cba7af65bfb110f /zookeeper-server/zookeeper-server-common/src/main | |
parent | 6067d082653ab2994a80ccdaeca72bdf46e65e10 (diff) |
MInor cleanup, no functional changes
Diffstat (limited to 'zookeeper-server/zookeeper-server-common/src/main')
4 files changed, 13 insertions, 16 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 9705c8c379e..863374f40f6 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 @@ -1,5 +1,4 @@ // 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; @@ -75,8 +74,8 @@ public class Configurator { sb.append("dataDir=").append(getDefaults().underVespaHome(config.dataDir())).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 - // Includes all available commands in 3.5, except 'wchc' and 'wchp' + // See http://zookeeper.apache.org/doc/r3.6.3/zookeeperAdmin.html#sc_zkCommands + // Includes all available commands in 3.6, except 'wchc' and 'wchp' sb.append("4lw.commands.whitelist=conf,cons,crst,dirs,dump,envi,mntr,ruok,srst,srvr,stat,wchs").append("\n"); sb.append("admin.enableServer=false").append("\n"); // Use custom connection factory for TLS on client port - see class' Javadoc for rationale @@ -107,7 +106,7 @@ public class Configurator { } } if (!found) { - throw new RuntimeException("No id in zookeeper server list that corresponds to my id(" + myid + ")"); + throw new RuntimeException("No id in zookeeper server list that corresponds to my id (" + myid + ")"); } } @@ -125,7 +124,7 @@ public class Configurator { // actually make the server an observer, but prevent it from forming an ensemble independently of the // existing cluster. // - // See https://zookeeper.apache.org/doc/r3.6.2/zookeeperReconfig.html#sc_reconfig_modifying + // See https://zookeeper.apache.org/doc/r3.6.3/zookeeperReconfig.html#sc_reconfig_modifying sb.append(":") .append("observer"); } diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ReconfigException.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ReconfigException.java index c4bb09eeedf..765bff474a8 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ReconfigException.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ReconfigException.java @@ -2,8 +2,8 @@ package com.yahoo.vespa.zookeeper; /** - * Exception used to wrap zookeeper exception when reconfiguration fails in a - * class that can be used without depending on ZooKeeper. + * Exception used to wrap zookeeper exception when reconfiguration fails, done to be able + * to use a class that does not depend on ZooKeeper. * * @author hmusum */ diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java index 9c2a543d2ef..f0318ddfcad 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java @@ -20,8 +20,8 @@ import java.util.logging.Logger; import java.util.stream.Collectors; /** - * Starts zookeeper server and supports reconfiguring zookeeper cluster. Created as a component - * without any config injected, to make sure that it is not recreated when config changes. + * Starts zookeeper server and supports reconfiguring zookeeper cluster. Keep this as a component + * without injected config, to make sure that it is not recreated when config changes. * * @author hmusum */ @@ -48,7 +48,6 @@ public class Reconfigurer extends AbstractComponent { Reconfigurer(VespaZooKeeperAdmin vespaZooKeeperAdmin, Sleeper sleeper) { this.vespaZooKeeperAdmin = Objects.requireNonNull(vespaZooKeeperAdmin); this.sleeper = Objects.requireNonNull(sleeper); - log.log(Level.FINE, "Created ZooKeeperReconfigurer"); } void startOrReconfigure(ZookeeperServerConfig newConfig, VespaZooKeeperServer server, @@ -155,7 +154,7 @@ public class Reconfigurer extends AbstractComponent { } private static List<String> servers(ZookeeperServerConfig config) { - // See https://zookeeper.apache.org/doc/r3.5.8/zookeeperReconfig.html#sc_reconfig_clientport for format + // See https://zookeeper.apache.org/doc/r3.6.3/zookeeperReconfig.html#sc_reconfig_clientport for format return config.server().stream() .map(server -> server.id() + "=" + server.hostname() + ":" + server.quorumPort() + ":" + server.electionPort() + ";" + config.clientPort()) diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java index 8c748250503..db8db1ac4b7 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java @@ -39,7 +39,7 @@ public class ZooKeeperRunner implements Runnable { this.zookeeperServerConfig = zookeeperServerConfig; this.server = server; new Configurator(zookeeperServerConfig).writeConfigToDisk(); - executorService = Executors.newSingleThreadExecutor(new DaemonThreadFactory("zookeeper server")); + executorService = Executors.newSingleThreadExecutor(new DaemonThreadFactory("zookeeper-server-")); executorService.submit(this); } @@ -66,14 +66,13 @@ public class ZooKeeperRunner implements Runnable { Instant end = now.plus(START_TIMEOUT); for (int attempt = 1; now.isBefore(end) && !executorService.isShutdown(); attempt++) { try { - log.log(Level.INFO, "Starting ZooKeeper server with config file " + path.toFile().getAbsolutePath() + + log.log(Level.INFO, "Starting ZooKeeper server with " + path.toFile().getAbsolutePath() + ". Trying to establish ZooKeeper quorum (members: " + - zookeeperServerHostnames(zookeeperServerConfig) + ", attempt: " + attempt + ")"); + zookeeperServerHostnames(zookeeperServerConfig) + ", attempt " + attempt + ")"); startServer(path); // Will block in a real implementation of VespaZooKeeperServer return; } catch (RuntimeException e) { - String messagePart = "Starting " + serverDescription() + " failed on attempt " + - attempt; + String messagePart = "Starting " + serverDescription() + " failed on attempt " + attempt; if (server.reconfigurable()) { Duration delay = backoff.delay(attempt); log.log(Level.WARNING, messagePart + ". Retrying in " + delay + ", time left " + |