summaryrefslogtreecommitdiffstats
path: root/zkfacade
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2019-09-30 11:17:28 +0200
committerHarald Musum <musum@verizonmedia.com>2019-09-30 11:17:28 +0200
commit8846d00e96ddfdcf0da76d8eeaab056dceeace73 (patch)
tree13b239e3adc1e74eb9da5581b6350185fd717ba8 /zkfacade
parentaa7061626f330bfb573f4afdbab8bc9ddd5ec927 (diff)
Do not use container parents even if we run ZooKeeper 3.5
Diffstat (limited to 'zkfacade')
-rw-r--r--zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java1
1 files changed, 1 insertions, 0 deletions
diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
index 4f9622de556..a543d43abcd 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java
@@ -87,6 +87,7 @@ public class Curator implements AutoCloseable {
.connectionTimeoutMs(ZK_CONNECTION_TIMEOUT)
.connectString(connectionSpec)
.zookeeperFactory(new DNSResolvingFixerZooKeeperFactory(UNKNOWN_HOST_TIMEOUT_MILLIS))
+ .dontUseContainerParents() // TODO: Remove when we know ZooKeeper 3.5 works fine, consider waiting until Vespa 8
.build());
}