Wait longer for all users of barrier.

Use logic from RemoveApplicationWaiter in CuratorCompletionWaiter as well:
Wait some time after quorum have reached barrier to see if another member
reaches barrier as well. Return anyway after some time.

1 files changed, 3 insertions, 2 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
index 8f3bc83984a..09a687657c6 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/application/TenantApplications.java
@@ -418,8 +418,9 @@ public class TenantApplications implements RequestHandler, HostValidator {
 
     /**
      * Waiter for removing application. Will wait for some time for all servers to remove application,
-     * but will accept majority of servers to have removed app if it takes a long time.
+     * but will accept the majority of servers to have removed app if it takes a long time.
      */
+    // TODO: Merge with CuratorCompletionWaiter
     static class RemoveApplicationWaiter implements CompletionWaiter {
 
         private static final java.util.logging.Logger log = Logger.getLogger(RemoveApplicationWaiter.class.getName());
@@ -485,7 +486,7 @@ public class TenantApplications implements RequestHandler, HostValidator {
                         gotQuorumTime = clock.instant();
 
                     // Give up if more than some time has passed since we got quorum, otherwise continue
-                    if (Duration.between(Instant.now(), gotQuorumTime.plus(waitForAll)).isNegative()) {
+                    if (Duration.between(clock.instant(), gotQuorumTime.plus(waitForAll)).isNegative()) {
                         logBarrierCompleted(respondents, startTime);
                         break;
                     }