summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJon Marius Venstad <jonmv@users.noreply.github.com>2023-03-22 21:04:08 +0100
committerGitHub <noreply@github.com>2023-03-22 21:04:08 +0100
commit8741b011cb22b809858e313dc4da47263a644bd6 (patch)
tree40d2b1a10de4ae58c6e0284f429b37cc4b3122e8
parent75f3408bf3cae9b2e11bfcafbdfd65f8066695f4 (diff)
parentbec9766343b10e42fb9329243f67edcb42b90a91 (diff)
Merge pull request #26536 from vespa-engine/freva/wait-less
Wait less before redeploying second time
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java3
1 files changed, 1 insertions, 2 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
index 9721396cd54..451f5555eb2 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java
@@ -1,7 +1,6 @@
// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
package com.yahoo.vespa.hosted.controller.deployment;
-import ai.vespa.http.DomainName;
import ai.vespa.http.HttpURL;
import com.yahoo.component.Version;
import com.yahoo.config.application.api.DeploymentSpec;
@@ -249,7 +248,7 @@ public class InternalStepRunner implements StepRunner {
}
case LOAD_BALANCER_NOT_READY, PARENT_HOST_NOT_READY -> {
logger.log(e.message()); // Consider splitting these messages in summary and details, on config server.
- Instant someTimeAfterStart = startTime.plusSeconds(450);
+ Instant someTimeAfterStart = startTime.plusSeconds(200);
Instant inALittleWhile = controller.clock().instant().plusSeconds(90);
controller.jobController().locked(id, run -> run.sleepingUntil(someTimeAfterStart.isAfter(inALittleWhile) ? someTimeAfterStart : inALittleWhile));
return result;