diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2023-10-18 18:17:30 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2023-10-18 18:17:30 +0200 |
| commit | ff71bc93baaab4b714ddccd29f5ea9ae31bc918c (patch) | |
| tree | a2a5ff8316cf9a281c30b51ad1e49537e0aa8b96 | |
| parent | 7742d05c1a9c1caf9e92874f92115ea767e2c2b8 (diff) | |
| parent | b6563a9347d35355ba6193c3cd41b0cc71e50504 (diff) | |
Merge pull request #29013 from vespa-engine/jonmv/remove-deployment-job-sleep-for-provisioning
Remove extra 1-minute naps when waiting for provisioning
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/deployment/InternalStepRunner.java | 4 |
1 files changed, 2 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 24e0bea3b44..c9719c3dd55 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 @@ -289,8 +289,8 @@ 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(200); - Instant inALittleWhile = controller.clock().instant().plusSeconds(60); - controller.jobController().locked(id, run -> run.sleepingUntil(someTimeAfterStart.isAfter(inALittleWhile) ? someTimeAfterStart : inALittleWhile)); + if (someTimeAfterStart.isAfter(controller.clock().instant())) + controller.jobController().locked(id, run -> run.sleepingUntil(someTimeAfterStart)); return result; } case NODE_ALLOCATION_FAILURE -> { |