More abortion fix

1 files changed, 6 insertions, 4 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 034f1405d75..694ff96a0e2 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
@@ -69,12 +69,14 @@ public class JobRunner extends Maintainer {
     /** Advances each of the ready steps for the given run, or marks it as finished, and stashes it. */
     private void advance(Run run) {
         if (   ! run.hasFailed()
-            &&   run.start().isBefore(controller().clock().instant().minus(jobTimeout)))
+            &&   run.start().isBefore(controller().clock().instant().minus(jobTimeout))) {
             jobs.abort(run.id());
-        List<Step> steps = run.readySteps();
-        if (steps.isEmpty())
+            advance(jobs.run(run.id()).get());
+        }
+        else if (run.readySteps().isEmpty())
             jobs.finish(run.id());
-        steps.forEach(step -> executors.execute(() -> advance(run.id(), step)));
+        else
+            run.readySteps().forEach(step -> executors.execute(() -> advance(run.id(), step)));
     }
 
     /** Attempts to advance the status of the given step, for the given run. */