diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2020-02-04 09:42:43 +0000 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2020-02-04 09:42:43 +0000 |
commit | 14e5202f2c270d1230596d7aceb8c96efada641c (patch) | |
tree | 796c051fa9d26359e7d16b722ea642188a2b2311 /container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java | |
parent | eca9169a2922d7fcb7544a842a4e9b54971e54bf (diff) |
Move pingfactory to constructor.
Diffstat (limited to 'container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java | 17 |
1 files changed, 8 insertions, 9 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java index 54d49569ede..54da33ac6dc 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java @@ -38,7 +38,7 @@ public class SearchCluster implements NodeManager<Node> { private final ImmutableList<Group> orderedGroups; private final ClusterMonitor<Node> clusterMonitor; private final VipStatus vipStatus; - private PingFactory pingFactory; + private final PingFactory pingFactory; private long nextLogTime = 0; /** @@ -51,10 +51,11 @@ public class SearchCluster implements NodeManager<Node> { */ private final Optional<Node> localCorpusDispatchTarget; - public SearchCluster(String clusterId, DispatchConfig dispatchConfig, int containerClusterSize, VipStatus vipStatus) { + public SearchCluster(String clusterId, DispatchConfig dispatchConfig, int containerClusterSize, VipStatus vipStatus, PingFactory pingFactory) { this.clusterId = clusterId; this.dispatchConfig = dispatchConfig; this.vipStatus = vipStatus; + this.pingFactory = pingFactory; List<Node> nodes = toNodes(dispatchConfig); this.size = nodes.size(); @@ -83,19 +84,17 @@ public class SearchCluster implements NodeManager<Node> { groups); this.clusterMonitor = new ClusterMonitor<>(this, false); + for (var group : orderedGroups) { + for (var node : group.nodes()) + clusterMonitor.add(node, true); + } } public void shutDown() { clusterMonitor.shutdown(); } - public void startClusterMonitoring(PingFactory pingFactory, boolean startPingThread) { - this.pingFactory = pingFactory; - - for (var group : orderedGroups) { - for (var node : group.nodes()) - clusterMonitor.add(node, true); - } + public void startClusterMonitoring(boolean startPingThread) { if (startPingThread) { clusterMonitor.start(); } |