diff options
3 files changed, 6 insertions, 11 deletions
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 4bbb8a63974..120eb967a73 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 @@ -132,17 +132,12 @@ public class SessionZooKeeperClient { return sessionPath.append(barrierName); } - /** Returns the number of node members needed in a barrier */ - private int getNumberOfMembers() { - return (curator.zooKeeperEnsembleCount() / 2) + 1; // majority - } - private CompletionWaiter createCompletionWaiter(String waiterNode) { - return curator.createCompletionWaiter(sessionPath, waiterNode, getNumberOfMembers(), serverId); + return curator.createCompletionWaiter(sessionPath, waiterNode, serverId); } private CompletionWaiter getCompletionWaiter(Path path) { - return curator.getCompletionWaiter(path, getNumberOfMembers(), serverId); + return curator.getCompletionWaiter(path, serverId); } /** Returns a transaction deleting this session on commit */ 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 80159624eed..9a7dd469fa1 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/Curator.java @@ -173,11 +173,11 @@ public class Curator extends AbstractComponent implements AutoCloseable { }); } - public CompletionWaiter getCompletionWaiter(Path waiterPath, int numMembers, String id) { + public CompletionWaiter getCompletionWaiter(Path waiterPath, String id) { return CuratorCompletionWaiter.create(this, waiterPath, id); } - public CompletionWaiter createCompletionWaiter(Path parentPath, String waiterNode, int numMembers, String id) { + public CompletionWaiter createCompletionWaiter(Path parentPath, String waiterNode, String id) { return CuratorCompletionWaiter.createAndInitialize(this, parentPath, waiterNode, id); } diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCurator.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCurator.java index e61e4f3add9..5ebd33801ed 100644 --- a/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCurator.java +++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/mock/MockCurator.java @@ -82,12 +82,12 @@ public class MockCurator extends Curator { } @Override - public CompletionWaiter getCompletionWaiter(Path parentPath, int numMembers, String id) { + public CompletionWaiter getCompletionWaiter(Path parentPath, String id) { return mockFramework().createCompletionWaiter(); } @Override - public CompletionWaiter createCompletionWaiter(Path parentPath, String waiterNode, int numMembers, String id) { + public CompletionWaiter createCompletionWaiter(Path parentPath, String waiterNode, String id) { return mockFramework().createCompletionWaiter(); } |