Construct ZKClientConfig from ZkClientConfigBuilder

Use ZKClientConfig builder from Curator and ZooKeeperDatabase

2 files changed, 16 insertions, 10 deletions

diff --git a/clustercontroller-core/pom.xml b/clustercontroller-core/pom.xml
index 8d62acb0fb4..02f61517083 100644
--- a/clustercontroller-core/pom.xml
+++ b/clustercontroller-core/pom.xml
@@ -79,6 +79,12 @@
             <scope>provided</scope>
         </dependency>
         <dependency>
+            <groupId>com.yahoo.vespa</groupId>
+            <artifactId>zookeeper-client-common</artifactId>
+            <version>${project.version}</version>
+            <scope>compile</scope>
+        </dependency>
+        <dependency>
             <!-- Not used by this module, but compilation fails without it because zookeeper uses these annotations.
                  Provided scoped here to avoid dependents getting it transitively. -->
             <groupId>com.github.spotbugs</groupId>
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 4cdbb49dedc..5e0d050cbcf 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,35 +1,35 @@
 // Copyright Verizon Media. 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.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 com.yahoo.vespa.zookeeper.client.ZkClientConfigBuilder;
 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.Stat;
 import org.apache.zookeeper.data.ACL;
+import org.apache.zookeeper.data.Stat;
 
+import java.io.IOException;
+import java.io.PrintWriter;
+import java.io.StringWriter;
+import java.nio.charset.Charset;
 import java.nio.charset.StandardCharsets;
 import java.util.List;
 import java.util.Map;
 import java.util.StringTokenizer;
 import java.util.TreeMap;
 import java.util.logging.Level;
-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.io.IOException;
-import java.io.StringWriter;
-import java.io.PrintWriter;
-import java.nio.charset.Charset;
 
 public class ZooKeeperDatabase extends Database {
 
@@ -108,7 +108,7 @@ public class ZooKeeperDatabase extends Database {
     public ZooKeeperDatabase(ContentCluster cluster, int nodeIndex, String address, int timeout, Database.DatabaseListener zksl) throws IOException, KeeperException, InterruptedException {
         this.nodeIndex = nodeIndex;
         zooKeeperRoot = "/vespa/fleetcontroller/" + cluster.getName() + "/";
-        session = new ZooKeeper(address, timeout, watcher);
+        session = new ZooKeeper(address, timeout, watcher, new ZkClientConfigBuilder().toConfig());
         boolean completedOk = false;
         try{
             this.listener = zksl;