2 files changed, 6 insertions, 1 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
index 03b51fbaf70..3fb0059ecb9 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/Dispatcher.java
@@ -125,6 +125,11 @@ public class Dispatcher extends AbstractComponent {
         this.maxHitsPerNode = dispatchConfig.maxHitsPerNode();
 
         searchCluster.startClusterMonitoring(pingFactory);
+        try {
+            while ( ! searchCluster.hasInformationAboutAllNodes()) {
+                Thread.sleep(1);
+            }
+        } catch (InterruptedException e) {}
     }
 
     /** Returns the search cluster this dispatches to */
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java
index a48d741bdca..cbe24eb6907 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java
@@ -240,7 +240,7 @@ public class SearchCluster implements NodeManager<Node> {
             vipStatus.removeFromRotation(clusterId);
     }
 
-    private boolean hasInformationAboutAllNodes() {
+    public boolean hasInformationAboutAllNodes() {
         return nodesByHost.values().stream().allMatch(node -> node.isWorking() != null);
     }