diff options
| author | Jon Marius Venstad <jonmv@users.noreply.github.com> | 2021-08-23 13:20:57 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-08-23 13:20:57 +0200 |
| commit | 5dcc45fb0319e2b59beb5813b37e60d2abc0f8bc (patch) | |
| tree | 72fc5ffee88521ee56b40038bd2c7e45e3464c9d /controller-server | |
| parent | e8f8e77b8df9ddb745f16b405a72611aca08ee5a (diff) | |
| parent | 6a4eab4dce7057e88dec8dd42e3f9ce3a7bcd558 (diff) | |
Merge pull request #18818 from vespa-engine/jonmv/fix-elusive-unit-test-instability
Try to run steps again if we bail out due to status change
Diffstat (limited to 'controller-server')
| -rw-r--r-- | controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java index 25207b733f0..3e710b59d50 100644 --- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java +++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java @@ -113,8 +113,10 @@ public class JobRunner extends ControllerMaintainer { jobs.locked(id.application(), id.type(), step, lockedStep -> { jobs.locked(id, run -> run); // Memory visibility. jobs.active(id).ifPresent(run -> { // The run may have become inactive, so we bail out. - if ( ! run.readySteps().contains(step)) + if ( ! run.readySteps().contains(step)) { + changed.set(true); return; // Someone may have updated the run status, making this step obsolete, so we bail out. + } StepInfo stepInfo = run.stepInfo(lockedStep.get()).orElseThrow(); if (stepInfo.startTime().isEmpty()) { |