diff options
author | Håkon Hallingstad <hakon@oath.com> | 2018-01-11 23:11:56 +0100 |
---|---|---|
committer | Håkon Hallingstad <hakon@oath.com> | 2018-01-11 23:11:56 +0100 |
commit | a6442d127d3bd311542842cdee2ee6dbba7b3629 (patch) | |
tree | 22387a253c0848efda52f3db7f00b4ed4f5d110a /configserver | |
parent | bd891f6ff6e029dca4083ca9205df8f36bda09ed (diff) |
Some Curator clients require ensemble connect string
Diffstat (limited to 'configserver')
2 files changed, 2 insertions, 2 deletions
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) { |