Merge pull request #23158 from ztlpn/fix-CORE-6851

tests/shard_placement_test: check total counts in rebalance_finished predicate

tests/rptest/tests/shard_placement_test.py

@@ -604,11 +604,23 @@ def shard_rebalance_finished():
                 node_id = self.redpanda.node_id(n)
                 shard_counts = self.get_shard_counts_by_topic(
                     shard_map, node_id)
+
+                total_counts = None
                 for topic in topics:
                     topic_counts = shard_counts[topic]
+
+                    if total_counts is None:
+                        total_counts = topic_counts
+                    else:
+                        for s, c in enumerate(topic_counts):
+                            total_counts[s] += c
+
                     if max(topic_counts) - min(topic_counts) > 1:
                         return False
 
+                if max(total_counts) - min(total_counts) > 1:
+                    return False
+
             return (True, shard_map)
 
         shard_map_after_balance = wait_until_result(shard_rebalance_finished,