Merge pull request #13147 from vespa-engine/jonmv/shut-down-job-runner-more-forcibly

Use shutdownNow if shutdown is not enough, after 10 seconds

1 files changed, 6 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 b26375ed4e6..cfe9257bdf8 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
@@ -58,9 +58,14 @@ public class JobRunner extends ControllerMaintainer {
         super.close();
         executors.shutdown();
         try {
-            executors.awaitTermination(50, TimeUnit.SECONDS);
+            if ( ! executors.awaitTermination(10, TimeUnit.SECONDS)) {
+                executors.shutdownNow();
+                if ( ! executors.awaitTermination(40, TimeUnit.SECONDS))
+                    throw new IllegalStateException("Failed shutting down " + JobRunner.class.getName());
+            }
         }
         catch (InterruptedException e) {
+            log.log(Level.WARNING, "Interrupted during shutdown of " + JobRunner.class.getName(), e);
             Thread.currentThread().interrupt();
         }
     }