diff options
| author | Henning Baldersheim <balder@yahoo-inc.com> | 2019-09-19 23:37:34 +0200 |
|---|---|---|
| committer | Henning Baldersheim <balder@yahoo-inc.com> | 2019-09-19 23:37:34 +0200 |
| commit | ee0100b9d505ab9238ea48d21be6326a26d90936 (patch) | |
| tree | 996530e80c4d6f6b07fe97b050f6456b6ae704cc /container-search/src/main/java/com/yahoo | |
| parent | 3da089f71cfc38431ef4508a99d9b075b955fbc0 (diff) | |
Drive the ping ourselves to avoid waiting for the monitor thread.
Diffstat (limited to 'container-search/src/main/java/com/yahoo')
| -rw-r--r-- | container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java | 2 | ||||
| -rw-r--r-- | container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java | 2 |
2 files changed, 3 insertions, 1 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java b/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java index 015adcf3490..22c7f59872c 100644 --- a/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java +++ b/container-search/src/main/java/com/yahoo/search/cluster/ClusterMonitor.java @@ -22,7 +22,7 @@ import java.util.logging.Logger; */ public class ClusterMonitor<T> { - private MonitorConfiguration configuration = new MonitorConfiguration(); + private final MonitorConfiguration configuration = new MonitorConfiguration(); private static Logger log = Logger.getLogger(ClusterMonitor.class.getName()); 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 44df0656361..c17212b2481 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 @@ -100,6 +100,8 @@ public class SearchCluster implements NodeManager<Node> { } } + ClusterMonitor<Node> clusterMonitor() { return clusterMonitor; } + private static Optional<Node> findLocalCorpusDispatchTarget(String selfHostname, int searchClusterSize, int containerClusterSize, |