Terminate if unable to shutdown executor, wait a shorter time

1 files changed, 5 insertions, 2 deletions

diff --git a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
index ccc9f615c93..b811fe21310 100644
--- a/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
+++ b/configserver/src/main/java/com/yahoo/vespa/config/server/ConfigServerBootstrap.java
@@ -229,12 +229,15 @@ public class ConfigServerBootstrap extends AbstractComponent implements Runnable
         List<ApplicationId> failedDeployments = checkDeployments(deployments);
 
         executor.shutdown();
-        executor.awaitTermination(365, TimeUnit.DAYS); // Timeout should never happen
+        if (! executor.awaitTermination(5, TimeUnit.HOURS)) {
+            log.log(Level.SEVERE, () -> "Unable to shutdown " + executor + ", waited 5 hours. Exiting");
+            System.exit(1);
+        }
 
         return failedDeployments;
     }
 
-    private enum DeploymentStatus { inProgress, done, failed}
+    private enum DeploymentStatus { inProgress, done, failed }
 
     private List<ApplicationId> checkDeployments(Map<ApplicationId, Future<?>> deployments) {
         int applicationCount = deployments.size();