diff options
author | jonmv <venstad@gmail.com> | 2023-08-31 15:54:07 +0200 |
---|---|---|
committer | jonmv <venstad@gmail.com> | 2023-08-31 15:54:07 +0200 |
commit | 4a442f83cbb4868419c2fab8a19fb8984303c1a7 (patch) | |
tree | 673c7141265b7675d7195e0cca18596a219ce269 | |
parent | 95c494d8899a5a0ddf1693e074aa5b555394a683 (diff) |
Have SystemInfo injected, which actually knows our cluster name
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/dispatch/ReconfigurableDispatcher.java | 9 |
1 files changed, 5 insertions, 4 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 c86c21d677f..2962fd3a3ec 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,5 +1,6 @@ package com.yahoo.search.dispatch; +import ai.vespa.cloud.SystemInfo; import com.yahoo.component.ComponentId; import com.yahoo.component.annotation.Inject; import com.yahoo.config.subscription.ConfigSubscriber; @@ -20,12 +21,12 @@ public class ReconfigurableDispatcher extends Dispatcher { private final ConfigSubscriber subscriber; @Inject - public ReconfigurableDispatcher(ComponentId clusterId, DispatchConfig dispatchConfig, QrConfig qrConfig, VipStatus vipStatus) { + public ReconfigurableDispatcher(ComponentId clusterId, DispatchConfig dispatchConfig, SystemInfo systemInfo, VipStatus vipStatus) { super(clusterId, dispatchConfig, new DispatchNodesConfig.Builder().build(), vipStatus); this.subscriber = new ConfigSubscriber(); CountDownLatch configured = new CountDownLatch(1); this.subscriber.subscribe(config -> { updateWithNewConfig(config); configured.countDown(); }, - DispatchNodesConfig.class, configId(clusterId, qrConfig)); + DispatchNodesConfig.class, configId(clusterId, systemInfo)); try { if ( ! configured.await(1, TimeUnit.MINUTES)) throw new IllegalStateException("timed out waiting for initial dispatch nodes config for " + clusterId.getName()); @@ -41,8 +42,8 @@ public class ReconfigurableDispatcher extends Dispatcher { super.deconstruct(); } - private static String configId(ComponentId clusterId, QrConfig qrConfig) { - return qrConfig.clustername() + "/component/" + clusterId.getName(); + private static String configId(ComponentId clusterId, SystemInfo systemInfo) { + return systemInfo.clusterName() + "/component/" + clusterId.getName(); } } |