summaryrefslogtreecommitdiffstats
path: root/zookeeper-server
diff options
context:
space:
mode:
authorJon Marius Venstad <venstad@gmail.com>2021-02-19 11:42:30 +0100
committerJon Marius Venstad <venstad@gmail.com>2021-02-19 12:34:16 +0100
commit1d1390fcfad2ace92795e47a15513a90d493cc95 (patch)
treec6a81a35fdb901c8f3332edfcea4b72858f3dc54 /zookeeper-server
parent59e42511f80704f7712fc3a2b01aa15865858951 (diff)
Die after 1 minute if no ZK-connection when constructing CC
Diffstat (limited to 'zookeeper-server')
-rw-r--r--zookeeper-server/zookeeper-server-common/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java4
1 files changed, 2 insertions, 2 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 4ef73ec2374..5296e3646c8 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
@@ -132,8 +132,8 @@ public class Reconfigurer extends AbstractComponent {
/** Returns the timeout to use for the given joining server count */
private static Duration reconfigTimeout(int joiningServers) {
- // For reconfig to succeed, the current ensemble must have a majority. When an ensemble grows and the joining
- // servers outnumber the existing ones, we have to wait for enough of them to start to have a majority.
+ // For reconfig to succeed, the current and resulting ensembles must have a majority. When an ensemble grows and
+ // the joining servers outnumber the existing ones, we have to wait for enough of them to start to have a majority.
return Duration.ofMillis(Math.max(joiningServers * NODE_TIMEOUT.toMillis(), MIN_TIMEOUT.toMillis()));
}