summaryrefslogtreecommitdiffstats
path: root/controller-server
diff options
context:
space:
mode:
authorjonmv <venstad@gmail.com>2022-07-05 15:26:41 +0200
committerjonmv <venstad@gmail.com>2022-07-05 15:26:41 +0200
commitef7a609e739f5367e5ccf1c40eedb8ac5e26c617 (patch)
tree1cfad18d07bb3ff5c941bd0534012c0ba06a24bf /controller-server
parent0d665219a01bbfaa1c5ffc7166912612b168d992 (diff)
Ensure stale run is not written back, in single-threaded test code
Diffstat (limited to 'controller-server')
-rw-r--r--controller-server/src/main/java/com/yahoo/vespa/hosted/controller/maintenance/JobRunner.java2
1 files changed, 1 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 c204f42e261..cd48d6839f3 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
@@ -92,7 +92,7 @@ public class JobRunner extends ControllerMaintainer {
else if (run.hasFailed() || run.sleepUntil().map(sleepUntil -> ! sleepUntil.isAfter(controller().clock().instant())).orElse(true))
run.readySteps().forEach(step -> executors.execute(() -> advance(run.id(), step)));
- return run;
+ return null;
});
}