diff options
| author | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-03-19 09:47:55 +0100 |
|---|---|---|
| committer | Bjørn Christian Seime <bjorncs@verizonmedia.com> | 2021-03-19 09:47:55 +0100 |
| commit | 1ee709ed0bea03df6dadd5b2b295b0a8232c86fb (patch) | |
| tree | 88175f318d65ff761d10ecce5f18c988eeffe0eb /zookeeper-server | |
| parent | 4210340b1244a1857ef87152d7ef147986d8f667 (diff) | |
Inject TLS aware ZK client config to ZooKeeperAdmin
Diffstat (limited to 'zookeeper-server')
| -rw-r--r-- | zookeeper-server/zookeeper-server-3.6.2/pom.xml | 5 | ||||
| -rw-r--r-- | zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java | 3 |
2 files changed, 7 insertions, 1 deletions
diff --git a/zookeeper-server/zookeeper-server-3.6.2/pom.xml b/zookeeper-server/zookeeper-server-3.6.2/pom.xml index 522bc71df97..c63aef15fee 100644 --- a/zookeeper-server/zookeeper-server-3.6.2/pom.xml +++ b/zookeeper-server/zookeeper-server-3.6.2/pom.xml @@ -18,6 +18,11 @@ <version>${project.version}</version> </dependency> <dependency> + <groupId>com.yahoo.vespa</groupId> + <artifactId>zookeeper-client-common</artifactId> + <version>${project.version}</version> + </dependency> + <dependency> <groupId>org.apache.zookeeper</groupId> <artifactId>zookeeper</artifactId> <version>3.6.2</version> diff --git a/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java b/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java index 8ae30942d55..d92527fb5fd 100644 --- a/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java +++ b/zookeeper-server/zookeeper-server-3.6.2/src/main/java/com/yahoo/vespa/zookeeper/VespaZooKeeperAdminImpl.java @@ -1,6 +1,7 @@ // Copyright Verizon Media. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root. package com.yahoo.vespa.zookeeper; +import com.yahoo.vespa.zookeeper.client.ZkClientConfigBuilder; import org.apache.zookeeper.KeeperException; import org.apache.zookeeper.admin.ZooKeeperAdmin; @@ -45,7 +46,7 @@ public class VespaZooKeeperAdminImpl implements VespaZooKeeperAdmin { private ZooKeeperAdmin createAdmin(String connectionSpec) throws IOException { return new ZooKeeperAdmin(connectionSpec, (int) sessionTimeout().toMillis(), - (event) -> log.log(Level.INFO, event.toString())); + (event) -> log.log(Level.INFO, event.toString()), new ZkClientConfigBuilder().toConfig()); } private static boolean retryOn(KeeperException e) { |