PartitionedNodeSorter -> NodeSorters

Author: nicktindall

server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocator.java

@@ -248,7 +248,7 @@ public static class Balancer {
         private final double avgDiskUsageInBytesPerNode;
         private final Map<String, ModelNode> nodes;
         private final BalancingWeights balancingWeights;
-        private final PartitionedNodeSorter partitionedNodeSorter;
+        private final NodeSorters nodeSorters;
 
         private Balancer(
             WriteLoadForecaster writeLoadForecaster,
@@ -265,8 +265,8 @@ private Balancer(
             avgWriteLoadPerNode = WeightFunction.avgWriteLoadPerNode(writeLoadForecaster, metadata, routingNodes);
             avgDiskUsageInBytesPerNode = WeightFunction.avgDiskUsageInBytesPerNode(allocation.clusterInfo(), metadata, routingNodes);
             nodes = Collections.unmodifiableMap(buildModelFromAssigned());
+            this.nodeSorters = balancingWeights.createNodeSorters(nodesArray(), this);
             this.balancingWeights = balancingWeights;
-            this.partitionedNodeSorter = balancingWeights.createPartitionedNodeSorter(nodesArray(), this);
         }
 
         private static long getShardDiskUsageInBytes(ShardRouting shardRouting, IndexMetadata indexMetadata, ClusterInfo clusterInfo) {
@@ -384,7 +384,7 @@ private void balance() {
             }
 
             // Balance each partition
-            for (NodeSorter nodeSorter : partitionedNodeSorter.allNodeSorters()) {
+            for (NodeSorter nodeSorter : nodeSorters.allNodeSorters()) {
                 balanceByWeights(nodeSorter);
             }
         }
@@ -395,7 +395,7 @@ private void balance() {
          * explain API only.
          */
         private MoveDecision decideRebalance(final ProjectIndex index, final ShardRouting shard, Decision canRemain) {
-            final NodeSorter sorter = partitionedNodeSorter.sorterForShard(shard);
+            final NodeSorter sorter = nodeSorters.sorterForShard(shard);
             index.assertMatch(shard);
             if (shard.started() == false) {
                 // we can only rebalance started shards
@@ -765,7 +765,7 @@ public void moveShards() {
          *      {@link MoveDecision#getNodeDecisions} will have a non-null value.
          */
         public MoveDecision decideMove(final ProjectIndex index, final ShardRouting shardRouting) {
-            NodeSorter sorter = partitionedNodeSorter.sorterForShard(shardRouting);
+            NodeSorter sorter = nodeSorters.sorterForShard(shardRouting);
             index.assertMatch(shardRouting);
 
             if (shardRouting.started() == false) {

server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancingWeights.java

@@ -35,14 +35,11 @@ public interface BalancingWeights {
     WeightFunction weightFunctionForNode(RoutingNode node);
 
     /**
-     * Create a partitioned node sorter for the cluster
+     * Create the node sorters for the cluster
      *
      * @param modelNodes The full set of cluster nodes
      * @param balancer The balancer
-     * @return a {@link PartitionedNodeSorter}
+     * @return a {@link NodeSorters} instance
      */
-    PartitionedNodeSorter createPartitionedNodeSorter(
-        BalancedShardsAllocator.ModelNode[] modelNodes,
-        BalancedShardsAllocator.Balancer balancer
-    );
+    NodeSorters createNodeSorters(BalancedShardsAllocator.ModelNode[] modelNodes, BalancedShardsAllocator.Balancer balancer);
 }

server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/GlobalBalancingWeightsFactory.java

@@ -51,14 +51,12 @@ public WeightFunction weightFunctionForNode(RoutingNode node) {
             return weightFunction;
         }
 
-        public PartitionedNodeSorter createPartitionedNodeSorter(
-            BalancedShardsAllocator.ModelNode[] modelNodes,
-            BalancedShardsAllocator.Balancer balancer
-        ) {
-            return new GlobalPartitionedNodeSorter(new BalancedShardsAllocator.NodeSorter(modelNodes, weightFunction, balancer));
+        @Override
+        public NodeSorters createNodeSorters(BalancedShardsAllocator.ModelNode[] modelNodes, BalancedShardsAllocator.Balancer balancer) {
+            return new GlobalNodeSorters(new BalancedShardsAllocator.NodeSorter(modelNodes, weightFunction, balancer));
         }
 
-        private record GlobalPartitionedNodeSorter(BalancedShardsAllocator.NodeSorter nodeSorter) implements PartitionedNodeSorter {
+        private record GlobalNodeSorters(BalancedShardsAllocator.NodeSorter nodeSorter) implements NodeSorters {
 
             @Override
             public Collection<BalancedShardsAllocator.NodeSorter> allNodeSorters() {

server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/PartitionedNodeSorter.java renamed to server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/NodeSorters.java

@@ -14,11 +14,11 @@
 import java.util.Collection;
 
 /**
- * Partitioned node sorter is just a cache of
+ * NodeSorters is just a cache of
  * {@link org.elasticsearch.cluster.routing.allocation.allocator.BalancedShardsAllocator.NodeSorter}
  * instances for each cluster partition
  */
-public interface PartitionedNodeSorter {
+public interface NodeSorters {
 
     /**
      * Get the {@link BalancedShardsAllocator.NodeSorter}s for all partitions