diff options
| author | Harald Musum <musum@yahoo-inc.com> | 2018-01-13 11:17:40 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2018-01-13 11:17:40 +0100 |
| commit | 1a0c107cb627068cd42656b828836e3cd4e68b34 (patch) | |
| tree | fbdc3cdf92e3ed3bb2c0b657586d9885010323a7 /configserver | |
| parent | f07a36c54fae6658e7bc23eb81f34a39729d8768 (diff) | |
| parent | c4c08573dece0be76d79867631d940f28d6b387c (diff) | |
Merge pull request #4633 from vespa-engine/hakonhall/some-curator-clients-require-ensemble-connect-string
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) { |