- Call getAsInt.....

- Add some debug logging.

2 files changed, 5 insertions, 3 deletions

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 be98ac57fc5..24caab75b32 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
@@ -69,8 +69,10 @@ public class Group {
             long average = activeDocs / numWorkingNodes;
             long deviation = nodes.stream().filter(node -> node.isWorking() == Boolean.TRUE).mapToLong(node -> Math.abs(node.getActiveDocuments() - average)).sum();
             boolean isDeviationSmall = deviation <= (activeDocs * MAX_UNBALANCE);
-            if (isDeviationSmall != isContentWellBalanced.get()) {
-                log.info("Content is well balanced has changed to" + isDeviationSmall);
+            if ((!isContentWellBalanced.get() || isDeviationSmall != isContentWellBalanced.get()) && (activeDocs > 0)) {
+                log.info("Content is " + (isDeviationSmall ? "" : "not") + " well balanced has changed to " + isDeviationSmall +
+                         ". Current deviation = " + deviation*100/activeDocs + " %" +
+                         ". activeDocs = " + activeDocs + ", deviation = " + deviation + ", average = " + average);
                 isContentWellBalanced.set(isDeviationSmall);
             }
         } else {
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 56165ec150b..1897c0af8bc 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
@@ -370,7 +370,7 @@ public class SearchCluster implements NodeManager<Node> {
 
     public boolean isGroupWellBalanced(OptionalInt groupId) {
         if (groupId.isEmpty()) return false;
-        Group group = groups().get(groupId);
+        Group group = groups().get(groupId.getAsInt());
         return (group != null) && group.isContentWellBalanced();
     }