Revert "Revert "Create dummy node after starting ZooKeeper server""

2 files changed, 6 insertions, 8 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 0a25d432766..eb84b13d4d6 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,13 +1,11 @@
 // 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.net.HostName;
+import com.yahoo.component.annotation.Inject;
 import com.yahoo.protect.Process;
 import com.yahoo.yolean.Exceptions;
-
 import java.time.Duration;
 import java.time.Instant;
 import java.util.List;
@@ -92,7 +90,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 = localConnectionSpec(activeConfig);
+        String connectionSpec = vespaZooKeeperAdmin.localConnectionSpec(activeConfig);
         Instant now = Instant.now();
         Duration reconfigTimeout = reconfigTimeout();
         Instant end = now.plus(reconfigTimeout);
@@ -136,10 +134,6 @@ 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 59c9628bcab..a9096125cba 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,6 +1,8 @@
 // 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;
 
 /**
@@ -15,4 +17,6 @@ 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(); }
+
 }