From 84cebdfff1d168dd17e096c12c6e491f63142256 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Fri, 16 Apr 2021 14:07:28 +0200 Subject: Improve coverage message --- .../dispatch/searchcluster/SearchCluster.java | 23 +++++++++++----------- 1 file changed, 11 insertions(+), 12 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 421082bb5dc..9485963abc3 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 @@ -358,7 +358,6 @@ public class SearchCluster implements NodeManager { private boolean isGroupCoverageSufficient(int workingNodesInGroup, long activeDocuments, long medianDocuments) { double documentCoverage = 100.0 * (double) activeDocuments / medianDocuments; - if (medianDocuments > 0 && documentCoverage < dispatchConfig.minActivedocsPercentage()) return false; @@ -397,21 +396,21 @@ public class SearchCluster implements NodeManager { nextLogTime = System.currentTimeMillis() + 30 * 1000; int requiredNodes = group.nodes().size() - dispatchConfig.maxNodesDownPerGroup(); if (fullCoverage) { - log.info(() -> String.format("Cluster %s: %s is now good again (%d/%d active docs, coverage %d/%d)", - clusterId, group, group.getActiveDocuments(), medianDocuments, - group.workingNodes(), group.nodes().size())); + log.info("Cluster " + clusterId + ": " + group + " has full coverage. " + + "Active documents: " + group.getActiveDocuments() + "/" + medianDocuments + ", " + + "working nodes: " + group.workingNodes() + "/" + group.nodes().size()); } else { - StringBuilder missing = new StringBuilder(); + StringBuilder unresponsive = new StringBuilder(); for (var node : group.nodes()) { - if (node.isWorking() != Boolean.TRUE) { - missing.append('\n').append(node); - } + if (node.isWorking() != Boolean.TRUE) + unresponsive.append('\n').append(node); } - log.warning(() -> String.format("Cluster %s: Coverage of %s is only %d/%d (requires %d) (%d/%d active docs) Failed nodes are:%s", - clusterId, group, group.workingNodes(), group.nodes().size(), requiredNodes, - group.getActiveDocuments(), medianDocuments, missing)); + log.warning("Cluster " + clusterId + ": " + group + " has reduced coverage: " + + "Active documents: " + group.getActiveDocuments() + "/" + medianDocuments + ", " + + "working nodes: " + group.workingNodes() + "/" + group.nodes().size() + " required " + requiredNodes + + ", unresponsive nodes: " + (unresponsive.toString().isEmpty() ? " none" : unresponsive)); } } } - + //Coverage of group 0 is only 12/12 (requires 12) (277422382/0 active docs) Failed nodes are: } -- cgit v1.2.3 From c80fd0f7f2605a50f800e78a56c2a298d5050fb6 Mon Sep 17 00:00:00 2001 From: Jon Bratseth Date: Fri, 16 Apr 2021 14:10:29 +0200 Subject: Remove comment --- .../java/com/yahoo/search/dispatch/searchcluster/SearchCluster.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) 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 9485963abc3..ce834b108db 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 @@ -412,5 +412,5 @@ public class SearchCluster implements NodeManager { } } } - //Coverage of group 0 is only 12/12 (requires 12) (277422382/0 active docs) Failed nodes are: + } -- cgit v1.2.3