diff options
author | Harald Musum <musum@verizonmedia.com> | 2019-09-27 14:24:07 +0200 |
---|---|---|
committer | GitHub <noreply@github.com> | 2019-09-27 14:24:07 +0200 |
commit | f026a03707025043dd607b911d4859894f1d65a4 (patch) | |
tree | 77a6552c9a329d2c3c605b8ba8d8a9812228f237 /clustercontroller-core/src/main | |
parent | 780dcd882cc85b24a29e7b6cd29bb58d20242a07 (diff) |
Revert "Reapply "upgrade to zookeeper 3.5""
Diffstat (limited to 'clustercontroller-core/src/main')
-rw-r--r-- | clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java | 26 |
1 files changed, 9 insertions, 17 deletions
diff --git a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java index adba17040f0..880f2cdaf19 100644 --- a/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java +++ b/clustercontroller-core/src/main/java/com/yahoo/vespa/clustercontroller/core/database/ZooKeeperDatabase.java @@ -1,33 +1,25 @@ // Copyright 2017 Yahoo Holdings. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.clustercontroller.core.database; -import com.yahoo.log.LogLevel; -import com.yahoo.vdslib.state.Node; -import com.yahoo.vdslib.state.NodeState; -import com.yahoo.vdslib.state.State; import com.yahoo.vespa.clustercontroller.core.AnnotatedClusterState; import com.yahoo.vespa.clustercontroller.core.ClusterStateBundle; import com.yahoo.vespa.clustercontroller.core.ContentCluster; import com.yahoo.vespa.clustercontroller.core.rpc.EnvelopedClusterStateBundleCodec; import com.yahoo.vespa.clustercontroller.core.rpc.SlimeClusterStateBundleCodec; -import org.apache.zookeeper.CreateMode; -import org.apache.zookeeper.KeeperException; -import org.apache.zookeeper.WatchedEvent; -import org.apache.zookeeper.Watcher; -import org.apache.zookeeper.ZooDefs; -import org.apache.zookeeper.ZooKeeper; -import org.apache.zookeeper.data.ACL; +import org.apache.zookeeper.*; import org.apache.zookeeper.data.Stat; +import org.apache.zookeeper.data.ACL; +import com.yahoo.log.LogLevel; +import com.yahoo.vdslib.state.NodeState; +import com.yahoo.vdslib.state.State; +import com.yahoo.vdslib.state.Node; +import java.util.logging.Logger; +import java.util.*; import java.io.IOException; -import java.io.PrintWriter; import java.io.StringWriter; +import java.io.PrintWriter; import java.nio.charset.Charset; -import java.util.List; -import java.util.Map; -import java.util.StringTokenizer; -import java.util.TreeMap; -import java.util.logging.Logger; public class ZooKeeperDatabase extends Database { |