diff options
author | Martin Polden <mpolden@mpolden.no> | 2020-12-04 17:32:40 +0100 |
---|---|---|
committer | Martin Polden <mpolden@mpolden.no> | 2020-12-04 17:32:40 +0100 |
commit | 020777ab1bd382622a83185e680467a54265c3fb (patch) | |
tree | f858a476bb522f0546e7d7b201ef344fb16178a6 /zookeeper-server | |
parent | 134df580e61c4093967e89dfa537e640861e23ad (diff) |
Use a no-op watcher
Diffstat (limited to 'zookeeper-server')
-rw-r--r-- | zookeeper-server/zookeeper-server-3.5.6/src/main/java/com/yahoo/vespa/zookeeper/Reconfigurer.java | 13 |
1 files changed, 12 insertions, 1 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 1654327edcd..4f4935e365b 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 @@ -5,6 +5,8 @@ import com.google.inject.Inject; import com.yahoo.cloud.config.ZookeeperServerConfig; import com.yahoo.component.AbstractComponent; import org.apache.zookeeper.KeeperException; +import org.apache.zookeeper.WatchedEvent; +import org.apache.zookeeper.Watcher; import org.apache.zookeeper.admin.ZooKeeperAdmin; import java.io.IOException; @@ -59,7 +61,7 @@ public class Reconfigurer extends AbstractComponent { try { ZooKeeperAdmin zooKeeperAdmin = new ZooKeeperAdmin(connectionSpec, (int) sessionTimeout.toMillis(), - null); + new NoopWatcher()); long fromConfig = -1; // Using string parameters because the List variant of reconfigure fails to join empty lists (observed on 3.5.6, fixed in 3.7.0) byte[] appliedConfig = zooKeeperAdmin.reconfigure(joiningServers, leavingServers, null, fromConfig, null); @@ -156,4 +158,13 @@ public class Reconfigurer extends AbstractComponent { } } + private static class NoopWatcher implements Watcher { + + @Override + public void process(WatchedEvent event) { + // Ignored + } + + } + } |