summaryrefslogtreecommitdiffstats
path: root/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
diff options
context:
space:
mode:
authorBjørn Christian Seime <bjorncs@verizonmedia.com>2021-04-20 14:26:42 +0200
committerBjørn Christian Seime <bjorncs@verizonmedia.com>2021-04-20 14:26:42 +0200
commit6ea24730d0365358fc851a4da7bd346dd2d87d7b (patch)
tree41f815e971ffe8320f2b51a6c4a73275ed8e6523 /container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
parent24a32dbdd32503c08cb1d75dfb180b4402405160 (diff)
Remove FS4ResourcePool
Diffstat (limited to 'container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java')
-rw-r--r--container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java8
1 files changed, 4 insertions, 4 deletions
diff --git a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
index 37b0fd7ebfb..ccb6e1248b4 100644
--- a/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
+++ b/container-search/src/main/java/com/yahoo/prelude/cluster/ClusterSearcher.java
@@ -4,12 +4,12 @@ package com.yahoo.prelude.cluster;
import com.yahoo.component.ComponentId;
import com.yahoo.component.chain.dependencies.After;
import com.yahoo.component.provider.ComponentRegistry;
+import com.yahoo.container.QrConfig;
import com.yahoo.container.QrSearchersConfig;
import com.yahoo.container.handler.VipStatus;
import com.yahoo.prelude.IndexFacts;
import com.yahoo.prelude.fastsearch.ClusterParams;
import com.yahoo.prelude.fastsearch.DocumentdbInfoConfig;
-import com.yahoo.prelude.fastsearch.FS4ResourcePool;
import com.yahoo.prelude.fastsearch.FastSearcher;
import com.yahoo.prelude.fastsearch.SummaryParameters;
import com.yahoo.prelude.fastsearch.VespaBackEndSearcher;
@@ -66,7 +66,7 @@ public class ClusterSearcher extends Searcher {
ClusterConfig clusterConfig,
DocumentdbInfoConfig documentDbConfig,
ComponentRegistry<Dispatcher> dispatchers,
- FS4ResourcePool fs4ResourcePool,
+ QrConfig qrConfig,
VipStatus vipStatus) {
super(id);
@@ -92,12 +92,12 @@ public class ClusterSearcher extends Searcher {
}
if (searchClusterConfig.indexingmode() == STREAMING) {
- VdsStreamingSearcher searcher = vdsCluster(fs4ResourcePool.getServerId(), searchClusterIndex,
+ VdsStreamingSearcher searcher = vdsCluster(qrConfig.discriminator(), searchClusterIndex,
searchClusterConfig, docSumParams, documentDbConfig);
addBackendSearcher(searcher);
vipStatus.addToRotation(searcher.getName());
} else {
- FastSearcher searcher = searchDispatch(searchClusterIndex, searchClusterName, fs4ResourcePool.getServerId(),
+ FastSearcher searcher = searchDispatch(searchClusterIndex, searchClusterName, qrConfig.discriminator(),
docSumParams, documentDbConfig, dispatchers);
addBackendSearcher(searcher);