diff options
author | Jon Bratseth <bratseth@gmail.com> | 2020-03-26 00:03:14 +0100 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-03-26 00:03:14 +0100 |
commit | 6c5af990a2dbd8f532f9792cce927c8511844f93 (patch) | |
tree | d400133b5f3638575663074d89e3cbcf8c176020 /container-search/src/main | |
parent | 336a7fae3d7329bc90b9ed6c4e5e9285e2d956c0 (diff) |
Revert "Revert "Revert "Don't take combined clusters of size 1 down"""
Diffstat (limited to 'container-search/src/main')
-rw-r--r-- | container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java | 13 |
1 files changed, 5 insertions, 8 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 7862648ba51..7619cb34b77 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 @@ -78,10 +78,10 @@ public class SearchCluster implements NodeManager<Node> { this.nodesByHost = nodesByHostBuilder.build(); this.localCorpusDispatchTarget = findLocalCorpusDispatchTarget(HostName.getLocalhost(), - size, - containerClusterSize, - nodesByHost, - groups); + size, + containerClusterSize, + nodesByHost, + groups); } /* Testing only */ @@ -217,10 +217,7 @@ public class SearchCluster implements NodeManager<Node> { setInRotationOnlyIf(hasWorkingNodes()); } else if (usesLocalCorpusIn(node)) { // follow the status of this node - // Do not take this out of rotation if we're a combined cluster of size 1, - // as that can't be helpful, and leads to a deadlock where this node is never taken back in servic e - if (nodeIsWorking || size() > 1) - setInRotationOnlyIf(nodeIsWorking); + setInRotationOnlyIf(nodeIsWorking); } } |