summaryrefslogtreecommitdiffstats
path: root/zookeeper-server
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2020-12-04 13:28:00 +0100
committerHarald Musum <musum@verizonmedia.com>2020-12-04 13:28:12 +0100
commit4e360658e832106ccff64f49d9f591841fe7a51d (patch)
tree4c710c5d429f865da92cd27b4a7d68bca3dbae8d /zookeeper-server
parent62f160914b073b552fbc6286278bfcebe73ce5cc (diff)
Split out constant
Diffstat (limited to 'zookeeper-server')
-rw-r--r--zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java5
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 {