diff options
author | Harald Musum <musum@verizonmedia.com> | 2023-01-30 11:53:17 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2023-01-30 11:53:17 +0100 |
commit | a9559e62fd7316bb75d39ed1891a93f68554ebf6 (patch) | |
tree | 2e002718c30728e40ce062cc66fb4bf51cffd73b /zookeeper-server/zookeeper-server-common/src/main | |
parent | e01512af63118a1ae19d49a1350a3ed544a7a4c0 (diff) |
Revert "Create dummy node after starting ZooKeeper server"
Diffstat (limited to 'zookeeper-server/zookeeper-server-common/src/main')
2 files changed, 8 insertions, 6 deletions
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 eb84b13d4d6..0a25d432766 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 @@ -1,11 +1,13 @@ // Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.zookeeper; +import com.yahoo.component.annotation.Inject; import com.yahoo.cloud.config.ZookeeperServerConfig; import com.yahoo.component.AbstractComponent; -import com.yahoo.component.annotation.Inject; +import com.yahoo.net.HostName; import com.yahoo.protect.Process; import com.yahoo.yolean.Exceptions; + import java.time.Duration; import java.time.Instant; import java.util.List; @@ -90,7 +92,7 @@ public class Reconfigurer extends AbstractComponent { log.log(Level.INFO, "Will reconfigure ZooKeeper cluster." + "\nServers in active config:" + servers(activeConfig) + "\nServers in new config:" + servers(newConfig)); - String connectionSpec = vespaZooKeeperAdmin.localConnectionSpec(activeConfig); + String connectionSpec = localConnectionSpec(activeConfig); Instant now = Instant.now(); Duration reconfigTimeout = reconfigTimeout(); Instant end = now.plus(reconfigTimeout); @@ -134,6 +136,10 @@ public class Reconfigurer extends AbstractComponent { return TIMEOUT; } + private static String localConnectionSpec(ZookeeperServerConfig config) { + return HostName.getLocalhost() + ":" + config.clientPort(); + } + private static List<String> servers(ZookeeperServerConfig config) { return config.server().stream() .filter(server -> ! server.retired()) diff --git a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdmin.java b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdmin.java index a9096125cba..59c9628bcab 100644 --- a/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdmin.java +++ b/zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdmin.java @@ -1,8 +1,6 @@ // Copyright Yahoo. 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; -import com.yahoo.net.HostName; import java.time.Duration; /** @@ -17,6 +15,4 @@ public interface VespaZooKeeperAdmin { /* Timeout for connecting to ZooKeeper */ default Duration sessionTimeout() { return Duration.ofSeconds(30); } - default String localConnectionSpec(ZookeeperServerConfig config) { return HostName.getLocalhost() + ":" + config.clientPort(); } - } |