diff options
author | Harald Musum <musum@verizonmedia.com> | 2020-11-26 13:36:22 +0100 |
---|---|---|
committer | Harald Musum <musum@verizonmedia.com> | 2020-11-26 13:36:22 +0100 |
commit | 9ba59a35b7e8291cb53c6bf3ad7780c1c917514a (patch) | |
tree | 11feca574652a09a42480d0a32d69ed3d24ebbe9 /zookeeper-server | |
parent | aa89721a12856663a09fd12df108c1da7f2b8559 (diff) |
Minor fixes after review
Diffstat (limited to 'zookeeper-server')
4 files changed, 10 insertions, 13 deletions
diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java index 0a025d53fc4..55ddd4778f1 100644 --- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java +++ b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ReconfigurableVespaZooKeeperServer.java @@ -8,7 +8,7 @@ import com.yahoo.component.AbstractComponent; /** * Starts or reconfigures zookeeper cluster * - * @author Harald Musum + * @author hmusum */ public class ReconfigurableVespaZooKeeperServer extends AbstractComponent implements VespaZooKeeperServer { diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java index 52c6fda94be..14a9c08ae85 100644 --- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java +++ b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java @@ -13,6 +13,7 @@ import java.util.HashSet; import java.util.List; import java.util.Set; import java.util.logging.Level; +import java.util.logging.Logger; import java.util.stream.Collectors; /** @@ -22,7 +23,8 @@ import java.util.stream.Collectors; * @author hmusum */ public class Reconfigurer extends AbstractComponent { - private static final java.util.logging.Logger log = java.util.logging.Logger.getLogger(Reconfigurer.class.getName()); + private static final Logger log = java.util.logging.Logger.getLogger(Reconfigurer.class.getName()); + private static final int sessionTimeoutInSeconds = 30; private ZooKeeperRunner zooKeeperRunner; @@ -31,7 +33,6 @@ public class Reconfigurer extends AbstractComponent { log.log(Level.FINE, "Created ZooKeeperReconfigurer"); } - // For testing only void startOrReconfigure(ZookeeperServerConfig newConfig) { if (zooKeeperRunner == null) zooKeeperRunner = startServer(newConfig); @@ -48,7 +49,6 @@ public class Reconfigurer extends AbstractComponent { } private ZooKeeperRunner startServer(ZookeeperServerConfig zookeeperServerConfig) { - //System.out.println("Starting server with config " + zookeeperServerConfig); return new ZooKeeperRunner(zookeeperServerConfig); } @@ -65,8 +65,6 @@ public class Reconfigurer extends AbstractComponent { log.log(Level.INFO, "Will reconfigure zookeeper cluster. Joining servers: " + joiningServers + ", leaving servers: " + leavingServers + ", new members" + addedServers); - - int sessionTimeoutInSeconds = 30; try { ZooKeeperAdmin zooKeeperAdmin = new ZooKeeperAdmin(connectionSpec(existingConfig), sessionTimeoutInSeconds, null); @@ -77,13 +75,9 @@ public class Reconfigurer extends AbstractComponent { } } - List<String> currentServers() { - if (zooKeeperRunner == null) return List.of(); - - return servers(zooKeeperRunner.zookeeperServerConfig()); - } - - // Returns items in set a that are not in set b + /** + * Returns items in set a that are not in set b + */ List<String> setDifference(List<String> a, List<String> b) { Set<String> ret = new HashSet<>(a); ret.removeAll(b); diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java index 9b6624857ac..34c513a9457 100644 --- a/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java +++ b/zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/ZooKeeperRunner.java @@ -48,4 +48,5 @@ public class ZooKeeperRunner implements Runnable { public ZookeeperServerConfig zookeeperServerConfig() { return zookeeperServerConfig; } + } diff --git a/zookeeper-server/zookeeper-server-3.5.6/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java b/zookeeper-server/zookeeper-server-3.5.6/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java index cce9b4f6ff8..1f36f875642 100644 --- a/zookeeper-server/zookeeper-server-3.5.6/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java +++ b/zookeeper-server/zookeeper-server-3.5.6/src/test/java/com/yahoo/vespa/zookeeper/ReconfigurerTest.java @@ -16,6 +16,8 @@ import static org.junit.Assert.assertTrue; /** * Tests dynamic reconfiguration of zookeeper cluster. + * + * @author hmusum */ public class ReconfigurerTest { |