diff options
author | Henning Baldersheim <balder@yahoo-inc.com> | 2021-11-04 12:19:50 +0100 |
---|---|---|
committer | Henning Baldersheim <balder@yahoo-inc.com> | 2021-11-05 09:13:01 +0100 |
commit | 12aee4a484cef5b5e2d3266b862eb361a187b4cf (patch) | |
tree | 230b488fa99f70d7adfa009b3ae45d595a1bb72d | |
parent | c7d50a638da8d991254c3cc3c151d95ea5ef8b51 (diff) |
Log number of working/nodes and nodes.
4 files changed, 5 insertions, 9 deletions
diff --git a/container-search/src/main/java/com/yahoo/search/cluster/TrafficNodeMonitor.java b/container-search/src/main/java/com/yahoo/search/cluster/TrafficNodeMonitor.java index 7ce88346d3a..11475b6a0ca 100644 --- a/container-search/src/main/java/com/yahoo/search/cluster/TrafficNodeMonitor.java +++ b/container-search/src/main/java/com/yahoo/search/cluster/TrafficNodeMonitor.java @@ -38,10 +38,10 @@ public class TrafficNodeMonitor<T> extends BaseNodeMonitor<T> { respondedAt = now(); if (error.getCode() == Error.BACKEND_COMMUNICATION_ERROR.code) { - setWorking(false, "Connection failure: " + error.toString()); + setWorking(false, "Connection failure: " + error); } else if (error.getCode() == Error.NO_ANSWER_WHEN_PINGING_NODE.code) { if ((respondedAt - succeededAt) > 10000) { - setWorking(false, "Not working for 10 s: " + error.toString()); + setWorking(false, "Not working for 10 s: " + error); } } else { succeededAt = respondedAt; diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java b/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java index fa1615e7fb5..4e658122cdf 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/InterleavedSearchInvoker.java @@ -16,7 +16,6 @@ import java.util.ArrayList; import java.util.Collection; import java.util.Collections; import java.util.IdentityHashMap; -import java.util.Iterator; import java.util.List; import java.util.Optional; import java.util.Set; diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcClient.java b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcClient.java index 918d9566913..073d10b8f49 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcClient.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/rpc/RpcClient.java @@ -12,9 +12,6 @@ import com.yahoo.jrt.Supervisor; import com.yahoo.jrt.Target; import com.yahoo.jrt.Transport; import com.yahoo.jrt.Values; -import com.yahoo.prelude.fastsearch.FastHit; - -import java.util.List; /** * A client which uses rpc request to search nodes to implement the Client API. diff --git a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/Group.java b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/Group.java index 7415426eb69..e99c1d5ad32 100644 --- a/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/Group.java +++ b/container-search/src/main/java/com/yahoo/search/dispatch/searchcluster/Group.java @@ -76,9 +76,9 @@ public class Group { boolean balanced = skew <= activeDocs * maxContentSkew; if (!isBalanced.get() || balanced != isBalanced.get()) { if (!isSparse()) - log.info("Content in " + this + " is " + (balanced ? "" : "not ") + "well balanced. Current deviation = " + - skew * 100 / activeDocs + " %. activeDocs = " + activeDocs + ", skew = " + skew + - ", average = " + average); + log.info("Content in " + this + ", with " + numWorkingNodes + "/" + nodes.size() + " working nodes, is " + + (balanced ? "" : "not ") + "well balanced. Current deviation = " + skew * 100 / activeDocs + + " %. activeDocs = " + activeDocs + ", skew = " + skew + ", average = " + average); isBalanced.set(balanced); } } else { |