diff options
| -rw-r--r-- | zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java | 5 |
1 files changed, 3 insertions, 2 deletions
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 f2ab29de5ac..cd5161cad12 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 @@ -27,6 +27,7 @@ public class Reconfigurer extends AbstractComponent { private static final Logger log = java.util.logging.Logger.getLogger(Reconfigurer.class.getName()); private static final Duration sessionTimeout = Duration.ofSeconds(30); + private static final Duration retryReconfigurationPeriod = Duration.ofMinutes(5); private ZooKeeperRunner zooKeeperRunner; private ZookeeperServerConfig activeConfig; @@ -87,10 +88,10 @@ public class Reconfigurer extends AbstractComponent { joiningServers = joiningServers.isEmpty() ? null : joiningServers; log.log(Level.INFO, "Will reconfigure ZooKeeper cluster. Joining servers: " + joiningServers + ", leaving servers: " + leavingServers); + String connectionSpec = connectionSpec(activeConfig); boolean reconfigured = false; - Instant end = Instant.now().plus(Duration.ofMinutes(5)); - + Instant end = Instant.now().plus(retryReconfigurationPeriod); // Loop reconfiguring since we might need to wait until another reconfiguration is finished before we can succeed while ( ! reconfigured && Instant.now().isBefore(end)) { try { |