Wait for dispatch nodes config in ReconfigurableDispatcher constructor

1 files changed, 11 insertions, 7 deletions

diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/ReconfigurableDispatcher.java b/container-search/src/main/java/com/yahoo/search/dispatch/ReconfigurableDispatcher.java
index e0d7f7b911e..c86c21d677f 100644
--- a/container-search/src/main/java/com/yahoo/search/dispatch/ReconfigurableDispatcher.java
+++ b/container-search/src/main/java/com/yahoo/search/dispatch/ReconfigurableDispatcher.java
@@ -5,18 +5,13 @@ import com.yahoo.component.annotation.Inject;
 import com.yahoo.config.subscription.ConfigSubscriber;
 import com.yahoo.container.QrConfig;
 import com.yahoo.container.handler.VipStatus;
-import com.yahoo.messagebus.network.rpc.SlobrokConfigSubscriber;
 import com.yahoo.vespa.config.search.DispatchConfig;
 import com.yahoo.vespa.config.search.DispatchNodesConfig;
 import com.yahoo.yolean.UncheckedInterruptedException;
 
-import java.util.Objects;
-import java.util.concurrent.BlockingQueue;
-import java.util.concurrent.LinkedBlockingQueue;
+import java.util.concurrent.CountDownLatch;
 import java.util.concurrent.TimeUnit;
 
-import static java.util.Objects.requireNonNull;
-
 /**
  * @author jonmv
  */
@@ -28,7 +23,16 @@ public class ReconfigurableDispatcher extends Dispatcher {
     public ReconfigurableDispatcher(ComponentId clusterId, DispatchConfig dispatchConfig, QrConfig qrConfig, VipStatus vipStatus) {
         super(clusterId, dispatchConfig, new DispatchNodesConfig.Builder().build(), vipStatus);
         this.subscriber = new ConfigSubscriber();
-        this.subscriber.subscribe(this::updateWithNewConfig, DispatchNodesConfig.class, configId(clusterId, qrConfig));
+        CountDownLatch configured = new CountDownLatch(1);
+        this.subscriber.subscribe(config -> { updateWithNewConfig(config); configured.countDown(); },
+                                  DispatchNodesConfig.class, configId(clusterId, qrConfig));
+        try {
+            if ( ! configured.await(1, TimeUnit.MINUTES))
+                throw new IllegalStateException("timed out waiting for initial dispatch nodes config for " + clusterId.getName());
+        }
+        catch (InterruptedException e) {
+            throw new UncheckedInterruptedException("interrupted waiting for initial dispatch nodes config for " + clusterId.getName(), e);
+        }
     }
 
     @Override