Do not wait longer for more participants in barrier

1 files changed, 2 insertions, 11 deletions

diff --git a/zkfacade/src/main/java/com/yahoo/vespa/curator/CuratorCompletionWaiter.java b/zkfacade/src/main/java/com/yahoo/vespa/curator/CuratorCompletionWaiter.java
index 537ec2ae751..05582d6bbda 100644
--- a/zkfacade/src/main/java/com/yahoo/vespa/curator/CuratorCompletionWaiter.java
+++ b/zkfacade/src/main/java/com/yahoo/vespa/curator/CuratorCompletionWaiter.java
@@ -62,13 +62,8 @@ class CuratorCompletionWaiter implements Curator.CompletionWaiter {
                 log.log(Level.FINE, barrierCompletedMessage(respondents, startTime));
                 break;
             }
-            // Then, if some are missing after 2 seconds, allow if the server this code is running on is one of the repondents
-            if (usedMoreTimeThan(Duration.ofSeconds(2), startTime) && respondents.contains(myId) && respondents.size() >= barrierMemberCount()) {
-                log.log(Level.INFO, barrierCompletedMessage(respondents, startTime));
-                break;
-            }
-            // If some are still missing after 4 seconds, quorum is enough
-            if (usedMoreTimeThan(Duration.ofSeconds(4), startTime) && respondents.size() >= barrierMemberCount()) {
+            // If some are missing, quorum is enough
+            if (respondents.size() >= barrierMemberCount()) {
                 log.log(Level.INFO, barrierCompletedMessage(respondents, startTime));
                 break;
             }
@@ -79,10 +74,6 @@ class CuratorCompletionWaiter implements Curator.CompletionWaiter {
         return respondents;
     }
 
-    private boolean usedMoreTimeThan(Duration waitTime, Instant startTime) {
-        return clock.instant().isAfter(startTime.plus(waitTime));
-    }
-
     private String barrierCompletedMessage(List<String> respondents, Instant startTime) {
         return barrierPath + " completed in " + Duration.between(startTime, Instant.now()).toString() +
                ", " + respondents.size() + "/" + curator.zooKeeperEnsembleCount() + " responded: " + respondents;