diff options
author | Martin Polden <mpolden@mpolden.no> | 2020-12-03 13:00:17 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2020-12-03 13:00:17 +0100 |
commit | 0ca2134fa5431caff3ca8a842dabbadec319d74a (patch) | |
tree | 37de48cc409c281945d3da4f2df63c71f9cade77 /zookeeper-server | |
parent | 7469a5bb5e9e37d2c9d93eaf4e53a21a9b4deeab (diff) |
Pass correct timeout to ZooKeeperAdmin
Diffstat (limited to 'zookeeper-server')
-rw-r--r-- | zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java | 8 |
1 files changed, 6 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 02b58fae21d..43ed25c1b18 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 @@ -8,6 +8,7 @@ import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.admin.ZooKeeperAdmin; import java.io.IOException; +import java.time.Duration; import java.util.ArrayList; import java.util.HashSet; import java.util.List; @@ -23,8 +24,9 @@ import java.util.stream.Collectors; * @author hmusum */ public class Reconfigurer extends AbstractComponent { + private static final Logger log = java.util.logging.Logger.getLogger(Reconfigurer.class.getName()); - private static final int sessionTimeoutInSeconds = 30; + private static final Duration sessionTimeout = Duration.ofSeconds(30); private ZooKeeperRunner zooKeeperRunner; private ZookeeperServerConfig zookeeperServerConfig; @@ -64,7 +66,9 @@ public class Reconfigurer extends AbstractComponent { ", leaving servers: " + leavingServers + ", new members: " + addedServers); try { - ZooKeeperAdmin zooKeeperAdmin = new ZooKeeperAdmin(connectionSpec(reconfigurationInfo.existingConfig()), sessionTimeoutInSeconds, null); + ZooKeeperAdmin zooKeeperAdmin = new ZooKeeperAdmin(connectionSpec(reconfigurationInfo.existingConfig()), + (int) sessionTimeout.toMillis(), + null); long fromConfig = -1; String joiningServersString = String.join(",", joiningServers); |