1 files changed, 3 insertions, 1 deletions
diff --git a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java
index df0e7b7d0b5..bd105c5c6c1 100644
--- a/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java
+++ b/clustercontroller-apps/src/main/java/com/yahoo/vespa/clustercontroller/apps/clustercontroller/ClusterController.java
@@ -16,6 +16,7 @@ import com.yahoo.vespa.zookeeper.VespaZooKeeperServer;
 import java.util.LinkedHashMap;
 import java.util.Map;
 import java.util.TreeMap;
+import java.util.concurrent.TimeUnit;
 import java.util.logging.Logger;
 
 /**
@@ -98,7 +99,8 @@ public class ClusterController extends AbstractComponent
     private void verifyThatZooKeeperWorks(FleetControllerOptions options) throws Exception {
         if (options.zooKeeperServerAddress != null && !"".equals(options.zooKeeperServerAddress)) {
             try (Curator curator = Curator.create(options.zooKeeperServerAddress)) {
-                curator.framework().blockUntilConnected();
+                if ( ! curator.framework().blockUntilConnected(60, TimeUnit.SECONDS))
+                    com.yahoo.protect.Process.logAndDie("Failed to connect to ZK, dying and restarting container");
             }
         }
     }