summaryrefslogtreecommitdiffstats
path: root/container-search
diff options
context:
space:
mode:
authorJon Bratseth <bratseth@oath.com>2019-02-25 22:45:14 +0100
committerGitHub <noreply@github.com>2019-02-25 22:45:14 +0100
commit04a883d162bed335616fd5a85600846e7ccb1c4b (patch)
treeb6c87edb069e7c97b821c68c6e6fda8e86f627be /container-search
parent1d90fc33825e0af5d448716f40b742851ecc66e4 (diff)
parent9511dfdb35edb1db9fbfc89344de03be64d06d64 (diff)
Merge pull request #8592 from vespa-engine/bratseth/dont-receive-traffic-until-all-is-constructed
Remove initiallyInRotation=false option: Not used
Diffstat (limited to 'container-search')
-rw-r--r--container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTester.java14
1 files changed, 10 insertions, 4 deletions
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTester.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTester.java
index 5377eb670c4..0caef371d0c 100644
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTester.java
+++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTester.java
@@ -2,6 +2,7 @@
package com.yahoo.prelude.fastsearch.test;
import com.google.common.util.concurrent.MoreExecutors;
+import com.yahoo.container.QrSearchersConfig;
import com.yahoo.container.handler.ClustersStatus;
import com.yahoo.container.handler.VipStatus;
import com.yahoo.net.HostName;
@@ -45,11 +46,16 @@ class FastSearcherTester {
}
public FastSearcherTester(int containerClusterSize, List<Node> searchNodes) {
- ClustersStatus clustersStatus = new ClustersStatus();
- clustersStatus.setContainerHasClusters(true);
- vipStatus = new VipStatus(clustersStatus);
+ String clusterId = "a";
+
+ var b = new QrSearchersConfig.Builder();
+ var searchClusterB = new QrSearchersConfig.Searchcluster.Builder();
+ searchClusterB.name(clusterId);
+ b.searchcluster(searchClusterB);
+ vipStatus = new VipStatus(b.build());
+
mockFS4ResourcePool = new MockFS4ResourcePool();
- mockDispatcher = new MockDispatcher("a", searchNodes, mockFS4ResourcePool, containerClusterSize, vipStatus);
+ mockDispatcher = new MockDispatcher(clusterId, searchNodes, mockFS4ResourcePool, containerClusterSize, vipStatus);
fastSearcher = new FastSearcher(new MockBackend(selfHostname, 0L, true),
mockFS4ResourcePool,
mockDispatcher,