diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2022-11-23 11:35:03 +0100 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2022-11-23 11:36:28 +0100 |
| commit | 0a3d6beec5b28150694297a99716ea23732dc6c5 (patch) | |
| tree | 5437b4e56ef6fe10084b99fe22966cd7a9d9deab /container-search/src/test/java/com/yahoo/prelude | |
| parent | ef637d4a7236d6570c748ba5782e0435f628bd9a (diff) | |
Put the RpcClient back in the RpcResourcePool where it belongs.
Remove parts of schema test no longer valid.
Diffstat (limited to 'container-search/src/test/java/com/yahoo/prelude')
| -rw-r--r-- | container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java | 3 | ||||
| -rw-r--r-- | container-search/src/test/java/com/yahoo/prelude/fastsearch/test/MockDispatcher.java | 3 |
2 files changed, 2 insertions, 4 deletions
diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java index be23c21eaf6..2f960add4a8 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/FastSearcherTestCase.java @@ -13,7 +13,6 @@ import com.yahoo.prelude.fastsearch.SummaryParameters; import com.yahoo.search.Query; import com.yahoo.search.Result; import com.yahoo.search.Searcher; -import com.yahoo.search.dispatch.rpc.RpcClient; import com.yahoo.search.dispatch.rpc.RpcResourcePool; import com.yahoo.search.dispatch.searchcluster.Node; import com.yahoo.search.grouping.GroupingRequest; @@ -186,7 +185,7 @@ public class FastSearcherTestCase { b.searchcluster(searchClusterB); VipStatus vipStatus = new VipStatus(b.build()); List<Node> nodes_1 = ImmutableList.of(new Node(0, "host0", 0)); - RpcResourcePool rpcPool_1 = new RpcResourcePool(new RpcClient("rpcclient", 1), MockDispatcher.toNodesConfig(nodes_1), 2); + RpcResourcePool rpcPool_1 = new RpcResourcePool(MockDispatcher.toDispatchConfig(), MockDispatcher.toNodesConfig(nodes_1)); MockDispatcher dispatch_1 = MockDispatcher.create(nodes_1, rpcPool_1, vipStatus); dispatch_1.clusterMonitor.shutdown(); vipStatus.addToRotation(clusterName); diff --git a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/MockDispatcher.java b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/MockDispatcher.java index 10e188d092c..a444159952d 100644 --- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/MockDispatcher.java +++ b/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/MockDispatcher.java @@ -4,7 +4,6 @@ package com.yahoo.prelude.fastsearch.test; import com.yahoo.container.handler.VipStatus; import com.yahoo.search.cluster.ClusterMonitor; import com.yahoo.search.dispatch.Dispatcher; -import com.yahoo.search.dispatch.rpc.RpcClient; import com.yahoo.search.dispatch.rpc.RpcInvokerFactory; import com.yahoo.search.dispatch.rpc.RpcPingFactory; import com.yahoo.search.dispatch.rpc.RpcResourcePool; @@ -20,7 +19,7 @@ class MockDispatcher extends Dispatcher { public final ClusterMonitor clusterMonitor; public static MockDispatcher create(List<Node> nodes) { - var rpcResourcePool = new RpcResourcePool(new RpcClient("rpcclient", 1), toNodesConfig(nodes), 2); + var rpcResourcePool = new RpcResourcePool(toDispatchConfig(), toNodesConfig(nodes)); return create(nodes, rpcResourcePool, new VipStatus()); } |