Revert "Revert "Disable topk optimisation on dispatch when content distribution is se…""

1 files changed, 6 insertions, 0 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 2f62b07ac04..56165ec150b 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
@@ -368,6 +368,12 @@ public class SearchCluster implements NodeManager<Node> {
         return workingNodes + nodesAllowedDown >= nodesInGroup;
     }
 
+    public boolean isGroupWellBalanced(OptionalInt groupId) {
+        if (groupId.isEmpty()) return false;
+        Group group = groups().get(groupId);
+        return (group != null) && group.isContentWellBalanced();
+    }
+
     /**
      * Calculate whether a subset of nodes in a group has enough coverage
      */