Put loadbalancer and invokerfactory in a volatile object to ensure atomic switch when reconfiguring.

2 files changed, 1 insertions, 59 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 2f960add4a8..e9b1cbabc79 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,6 +13,7 @@ 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.MockDispatcher;
 import com.yahoo.search.dispatch.rpc.RpcResourcePool;
 import com.yahoo.search.dispatch.searchcluster.Node;
 import com.yahoo.search.grouping.GroupingRequest;
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
deleted file mode 100644
index 886c9818842..00000000000
--- a/container-search/src/test/java/com/yahoo/prelude/fastsearch/test/MockDispatcher.java
+++ /dev/null
@@ -1,59 +0,0 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
-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.RpcInvokerFactory;
-import com.yahoo.search.dispatch.rpc.RpcPingFactory;
-import com.yahoo.search.dispatch.rpc.RpcResourcePool;
-import com.yahoo.search.dispatch.searchcluster.Node;
-import com.yahoo.search.dispatch.searchcluster.SearchCluster;
-import com.yahoo.vespa.config.search.DispatchConfig;
-import com.yahoo.vespa.config.search.DispatchNodesConfig;
-
-import java.util.List;
-
-class MockDispatcher extends Dispatcher {
-
-    public final ClusterMonitor clusterMonitor;
-
-    public static MockDispatcher create(List<Node> nodes) {
-        var rpcResourcePool = new RpcResourcePool(toDispatchConfig(), toNodesConfig(nodes));
-
-        return create(nodes, rpcResourcePool, new VipStatus());
-    }
-
-    public static MockDispatcher create(List<Node> nodes, RpcResourcePool rpcResourcePool, VipStatus vipStatus) {
-        var dispatchConfig = toDispatchConfig();
-        var searchCluster = new SearchCluster("a", dispatchConfig.minActivedocsPercentage(), nodes, vipStatus, new RpcPingFactory(rpcResourcePool));
-        return new MockDispatcher(new ClusterMonitor<>(searchCluster, true), searchCluster, dispatchConfig, rpcResourcePool);
-    }
-
-    private MockDispatcher(ClusterMonitor clusterMonitor, SearchCluster searchCluster, DispatchConfig dispatchConfig, RpcResourcePool rpcResourcePool) {
-        this(clusterMonitor, searchCluster, dispatchConfig, new RpcInvokerFactory(rpcResourcePool, searchCluster, dispatchConfig));
-    }
-
-    private MockDispatcher(ClusterMonitor clusterMonitor, SearchCluster searchCluster, DispatchConfig dispatchConfig, RpcInvokerFactory invokerFactory) {
-        super(clusterMonitor, searchCluster, dispatchConfig, invokerFactory);
-        this.clusterMonitor = clusterMonitor;
-    }
-
-    static DispatchConfig toDispatchConfig() {
-        return new DispatchConfig.Builder().build();
-    }
-    static DispatchNodesConfig toNodesConfig(List<Node> nodes) {
-        DispatchNodesConfig.Builder dispatchConfigBuilder = new DispatchNodesConfig.Builder();
-        int key = 0;
-        for (Node node : nodes) {
-            DispatchNodesConfig.Node.Builder dispatchConfigNodeBuilder = new DispatchNodesConfig.Node.Builder();
-            dispatchConfigNodeBuilder.host(node.hostname());
-            dispatchConfigNodeBuilder.port(0); // Mandatory, but currently not used here
-            dispatchConfigNodeBuilder.group(node.group());
-            dispatchConfigNodeBuilder.key(key++); // not used
-            dispatchConfigBuilder.node(dispatchConfigNodeBuilder);
-        }
-        return dispatchConfigBuilder.build();
-    }
-
-}