Catch exceptions in JobRunner, rather than leaking to stderr

1 files changed, 11 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 f13c31de5d7..26f2ce02ec2 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
@@ -18,6 +18,7 @@ import java.util.concurrent.Executors;
 import java.util.concurrent.TimeUnit;
 import java.util.concurrent.TimeoutException;
 import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.logging.Level;
 import java.util.logging.Logger;
 
 /**
@@ -73,11 +74,20 @@ public class JobRunner extends Maintainer {
             advance(jobs.run(run.id()).get());
         }
         else if (run.readySteps().isEmpty())
-            executors.execute(() -> jobs.finish(run.id()));
+            executors.execute(() -> finish(run.id()));
         else
             run.readySteps().forEach(step -> executors.execute(() -> advance(run.id(), step)));
     }
 
+    private void finish(RunId id) {
+        try {
+            jobs.finish(id);
+        }
+        catch (Exception e) {
+            log.log(LogLevel.WARNING, "Exception finishing " + id, e);
+        }
+    }
+
     /** Attempts to advance the status of the given step, for the given run. */
     private void advance(RunId id, Step step) {
         try {