summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHarald Musum <musum@verizonmedia.com>2021-04-19 20:15:53 +0200
committerGitHub <noreply@github.com>2021-04-19 20:15:53 +0200
commit5005b13464fd0e87f9cbe02c2790e5b8e2c3887f (patch)
tree8ce63a7d16aabf020e8b9d763284a8c33586dfbb
parent3ac389c7fb08c5301e97f9ff5b162efcb1a87e4c (diff)
parentb8ee73c7f2a6ba56d3d9a61413a9173164b0c64a (diff)
Merge pull request #17492 from vespa-engine/hmusum/increase-min-timeout-for-activate-application
Double timeout waiting for activation on config servers to 120 seconds
-rw-r--r--configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java2
1 files changed, 1 insertions, 1 deletions
diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
index 1734b84ec43..181ed880fd7 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/session/SessionRepository.java
@@ -621,7 +621,7 @@ public class SessionRepository {
sessionZKClient.createNewSession(clock.instant());
CompletionWaiter waiter = sessionZKClient.getUploadWaiter();
LocalSession session = new LocalSession(tenantName, sessionId, app, sessionZKClient);
- waiter.awaitCompletion(Duration.ofSeconds(Math.min(60, timeoutBudget.timeLeft().getSeconds())));
+ waiter.awaitCompletion(Duration.ofSeconds(Math.min(120, timeoutBudget.timeLeft().getSeconds())));
addLocalSession(session);
return session;
} catch (Exception e) {