TieredBalancingWeightsFactory -> StatelessBalancingWeightsFactory

Author: nicktindall

server/src/main/java/org/elasticsearch/cluster/ClusterModule.java

@@ -44,7 +44,7 @@
 import org.elasticsearch.cluster.routing.allocation.allocator.DesiredBalanceShardsAllocator.DesiredBalanceReconcilerAction;
 import org.elasticsearch.cluster.routing.allocation.allocator.GlobalBalancingWeightsFactory;
 import org.elasticsearch.cluster.routing.allocation.allocator.ShardsAllocator;
-import org.elasticsearch.cluster.routing.allocation.allocator.TieredBalancingWeightsFactory;
+import org.elasticsearch.cluster.routing.allocation.allocator.StatelessBalancingWeightsFactory;
 import org.elasticsearch.cluster.routing.allocation.decider.AllocationDecider;
 import org.elasticsearch.cluster.routing.allocation.decider.AllocationDeciders;
 import org.elasticsearch.cluster.routing.allocation.decider.AwarenessAllocationDecider;
@@ -153,7 +153,7 @@ public ClusterModule(
         // I'm aware that the following is an anti-pattern and will implement as an SPI provider or plugin
         // if we decide to go ahead with this.
         final BalancingWeightsFactory balancingWeightsFactory = DiscoveryNode.isStateless(settings)
-            ? new TieredBalancingWeightsFactory(balancerSettings, clusterService.getClusterSettings())
+            ? new StatelessBalancingWeightsFactory(balancerSettings, clusterService.getClusterSettings())
             : new GlobalBalancingWeightsFactory(balancerSettings);
         var nodeAllocationStatsAndWeightsCalculator = new NodeAllocationStatsAndWeightsCalculator(
             writeLoadForecaster,

…cator/TieredBalancingWeightsFactory.java …or/StatelessBalancingWeightsFactory.javaserver/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/TieredBalancingWeightsFactory.java renamed to server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/StatelessBalancingWeightsFactory.java server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/TieredBalancingWeightsFactory.java renamed to server/src/main/java/org/elasticsearch/cluster/routing/allocation/allocator/StatelessBalancingWeightsFactory.java

@@ -24,7 +24,7 @@
 import static org.elasticsearch.cluster.routing.allocation.allocator.BalancedShardsAllocator.SHARD_BALANCE_FACTOR_SETTING;
 import static org.elasticsearch.cluster.routing.allocation.allocator.BalancedShardsAllocator.WRITE_LOAD_BALANCE_FACTOR_SETTING;
 
-public class TieredBalancingWeightsFactory implements BalancingWeightsFactory {
+public class StatelessBalancingWeightsFactory implements BalancingWeightsFactory {
 
     public static final Setting<Float> INDEXING_TIER_SHARD_BALANCE_FACTOR_SETTING = Setting.floatSetting(
         "cluster.routing.allocation.balance.shard.indexing",
@@ -55,7 +55,7 @@ public class TieredBalancingWeightsFactory implements BalancingWeightsFactory {
     private volatile float searchTierShardBalanceFactor;
     private volatile float indexingTierWriteLoadBalanceFactor;
 
-    public TieredBalancingWeightsFactory(BalancerSettings balancerSettings, ClusterSettings clusterSettings) {
+    public StatelessBalancingWeightsFactory(BalancerSettings balancerSettings, ClusterSettings clusterSettings) {
         this.balancerSettings = balancerSettings;
         clusterSettings.initializeAndWatch(
             INDEXING_TIER_SHARD_BALANCE_FACTOR_SETTING,
@@ -70,15 +70,15 @@ public TieredBalancingWeightsFactory(BalancerSettings balancerSettings, ClusterS
 
     @Override
     public BalancingWeights create() {
-        return new TieredBalancingWeights();
+        return new StatelessBalancingWeights();
     }
 
-    private class TieredBalancingWeights implements BalancingWeights {
+    private class StatelessBalancingWeights implements BalancingWeights {
 
         private final WeightFunction searchWeightFunction;
         private final WeightFunction indexingWeightFunction;
 
-        private TieredBalancingWeights() {
+        private StatelessBalancingWeights() {
             this.searchWeightFunction = new WeightFunction(
                 searchTierShardBalanceFactor,
                 balancerSettings.getIndexBalanceFactor(),

server/src/main/java/org/elasticsearch/common/settings/ClusterSettings.java

@@ -51,7 +51,7 @@
 import org.elasticsearch.cluster.routing.allocation.allocator.BalancedShardsAllocator;
 import org.elasticsearch.cluster.routing.allocation.allocator.DesiredBalanceComputer;
 import org.elasticsearch.cluster.routing.allocation.allocator.DesiredBalanceReconciler;
-import org.elasticsearch.cluster.routing.allocation.allocator.TieredBalancingWeightsFactory;
+import org.elasticsearch.cluster.routing.allocation.allocator.StatelessBalancingWeightsFactory;
 import org.elasticsearch.cluster.routing.allocation.decider.AwarenessAllocationDecider;
 import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider;
 import org.elasticsearch.cluster.routing.allocation.decider.ConcurrentRebalanceAllocationDecider;
@@ -226,9 +226,9 @@ public void apply(Settings value, Settings current, Settings previous) {
         BalancedShardsAllocator.WRITE_LOAD_BALANCE_FACTOR_SETTING,
         BalancedShardsAllocator.DISK_USAGE_BALANCE_FACTOR_SETTING,
         BalancedShardsAllocator.THRESHOLD_SETTING,
-        TieredBalancingWeightsFactory.INDEXING_TIER_SHARD_BALANCE_FACTOR_SETTING,
-        TieredBalancingWeightsFactory.SEARCH_TIER_SHARD_BALANCE_FACTOR_SETTING,
-        TieredBalancingWeightsFactory.INDEXING_TIER_WRITE_LOAD_BALANCE_FACTOR_SETTING,
+        StatelessBalancingWeightsFactory.INDEXING_TIER_SHARD_BALANCE_FACTOR_SETTING,
+        StatelessBalancingWeightsFactory.SEARCH_TIER_SHARD_BALANCE_FACTOR_SETTING,
+        StatelessBalancingWeightsFactory.INDEXING_TIER_WRITE_LOAD_BALANCE_FACTOR_SETTING,
         DataStreamAutoShardingService.DATA_STREAMS_AUTO_SHARDING_DECREASE_SHARDS_COOLDOWN,
         DataStreamAutoShardingService.DATA_STREAMS_AUTO_SHARDING_INCREASE_SHARDS_COOLDOWN,
         DataStreamAutoShardingService.DATA_STREAMS_AUTO_SHARDING_EXCLUDES_SETTING,