From a6442d127d3bd311542842cdee2ee6dbba7b3629 Mon Sep 17 00:00:00 2001 From: Håkon Hallingstad Date: Thu, 11 Jan 2018 23:11:56 +0100 Subject: Some Curator clients require ensemble connect string --- .../com/yahoo/vespa/config/server/session/FileDistributionFactory.java | 2 +- .../com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) (limited to 'configserver') diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/FileDistributionFactory.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/FileDistributionFactory.java index 243c47ba3d7..02c854f4130 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/FileDistributionFactory.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/FileDistributionFactory.java @@ -27,7 +27,7 @@ public class FileDistributionFactory { @Inject public FileDistributionFactory(Curator curator) { - this(curator, curator.connectionSpec()); + this(curator, curator.zooKeeperEnsembleConnectionSpec()); } public FileDistributionFactory(Curator curator, String zkSpec) { diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java index 6a90eaacb02..f7d6b8f05fe 100644 --- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java +++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionZooKeeperClient.java @@ -117,7 +117,7 @@ public class SessionZooKeeperClient { /** Returns the number of node members needed in a barrier */ private int getNumberOfMembers() { - return (curator.serverCount() / 2) + 1; // majority + return (curator.zooKeeperEnsembleCount() / 2) + 1; // majority } private Curator.CompletionWaiter createCompletionWaiter(String waiterNode) { -- cgit v1.2.3