Use correct config id for dispatch config

1 files changed, 9 insertions, 2 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 625a8bcb6da..e0d7f7b911e 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
@@ -1,7 +1,9 @@
 package com.yahoo.search.dispatch;
 
 import com.yahoo.component.ComponentId;
+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;
@@ -22,10 +24,11 @@ public class ReconfigurableDispatcher extends Dispatcher {
 
     private final ConfigSubscriber subscriber;
 
-    public ReconfigurableDispatcher(ComponentId clusterId, DispatchConfig dispatchConfig, VipStatus vipStatus) {
+    @Inject
+    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, clusterId.stringValue());
+        this.subscriber.subscribe(this::updateWithNewConfig, DispatchNodesConfig.class, configId(clusterId, qrConfig));
     }
 
     @Override
@@ -34,4 +37,8 @@ public class ReconfigurableDispatcher extends Dispatcher {
         super.deconstruct();
     }
 
+    private static String configId(ComponentId clusterId, QrConfig qrConfig) {
+        return qrConfig.clustername() + "/component/" + clusterId.getName();
+    }
+
 }