Move balancer settings testing to use BalancerSettings

Author: nicktindall

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

@@ -239,27 +239,6 @@ private void failAllocationOfNewPrimaries(RoutingAllocation allocation) {
         }
     }
 
-    /**
-     * Returns the currently configured delta threshold
-     */
-    public float getThreshold() {
-        return balancerSettings.getThreshold();
-    }
-
-    /**
-     * Returns the index related weight factor.
-     */
-    public float getIndexBalance() {
-        return balancerSettings.getIndexBalanceFactor();
-    }
-
-    /**
-     * Returns the shard related weight factor.
-     */
-    public float getShardBalance() {
-        return balancerSettings.getShardBalanceFactor();
-    }
-
     /**
      * A {@link Balancer}
      */

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

@@ -34,10 +34,16 @@ public BalancerSettings(ClusterSettings clusterSettings) {
         clusterSettings.initializeAndWatch(THRESHOLD_SETTING, value -> this.threshold = value);
     }
 
+    /**
+     * Returns the index related weight factor.
+     */
     public float getIndexBalanceFactor() {
         return indexBalanceFactor;
     }
 
+    /**
+     * Returns the shard related weight factor.
+     */
     public float getShardBalanceFactor() {
         return shardBalanceFactor;
     }
@@ -50,6 +56,9 @@ public float getDiskUsageBalanceFactor() {
         return diskUsageBalanceFactor;
     }
 
+    /**
+     * Returns the currently configured delta threshold
+     */
     public float getThreshold() {
         return threshold;
     }

server/src/test/java/org/elasticsearch/cluster/routing/allocation/BalanceConfigurationTests.java

@@ -22,6 +22,7 @@
 import org.elasticsearch.cluster.routing.RoutingTable;
 import org.elasticsearch.cluster.routing.ShardRouting;
 import org.elasticsearch.cluster.routing.allocation.allocator.BalancedShardsAllocator;
+import org.elasticsearch.cluster.routing.allocation.allocator.BalancerSettings;
 import org.elasticsearch.cluster.routing.allocation.decider.ClusterRebalanceAllocationDecider;
 import org.elasticsearch.common.settings.ClusterSettings;
 import org.elasticsearch.common.settings.Settings;
@@ -286,9 +287,9 @@ public void testPersistedSettings() {
         settings.put(BalancedShardsAllocator.SHARD_BALANCE_FACTOR_SETTING.getKey(), 0.3);
         settings.put(BalancedShardsAllocator.THRESHOLD_SETTING.getKey(), 2.0);
         ClusterSettings service = new ClusterSettings(settings.build(), ClusterSettings.BUILT_IN_CLUSTER_SETTINGS);
-        BalancedShardsAllocator allocator = new BalancedShardsAllocator(service, WriteLoadForecaster.DEFAULT);
-        assertThat(allocator.getIndexBalance(), Matchers.equalTo(0.2f));
-        assertThat(allocator.getShardBalance(), Matchers.equalTo(0.3f));
+        BalancerSettings allocator = new BalancerSettings(service);
+        assertThat(allocator.getIndexBalanceFactor(), Matchers.equalTo(0.2f));
+        assertThat(allocator.getShardBalanceFactor(), Matchers.equalTo(0.3f));
         assertThat(allocator.getThreshold(), Matchers.equalTo(2.0f));
 
         settings = Settings.builder();
@@ -300,17 +301,17 @@ public void testPersistedSettings() {
             ClusterRebalanceAllocationDecider.ClusterRebalanceType.ALWAYS.toString()
         );
         service.applySettings(settings.build());
-        assertThat(allocator.getIndexBalance(), Matchers.equalTo(0.2f));
-        assertThat(allocator.getShardBalance(), Matchers.equalTo(0.3f));
+        assertThat(allocator.getIndexBalanceFactor(), Matchers.equalTo(0.2f));
+        assertThat(allocator.getShardBalanceFactor(), Matchers.equalTo(0.3f));
         assertThat(allocator.getThreshold(), Matchers.equalTo(2.0f));
 
         settings = Settings.builder();
         settings.put(BalancedShardsAllocator.INDEX_BALANCE_FACTOR_SETTING.getKey(), 0.5);
         settings.put(BalancedShardsAllocator.SHARD_BALANCE_FACTOR_SETTING.getKey(), 0.1);
         settings.put(BalancedShardsAllocator.THRESHOLD_SETTING.getKey(), 3.0);
         service.applySettings(settings.build());
-        assertThat(allocator.getIndexBalance(), Matchers.equalTo(0.5f));
-        assertThat(allocator.getShardBalance(), Matchers.equalTo(0.1f));
+        assertThat(allocator.getIndexBalanceFactor(), Matchers.equalTo(0.5f));
+        assertThat(allocator.getShardBalanceFactor(), Matchers.equalTo(0.1f));
         assertThat(allocator.getThreshold(), Matchers.equalTo(3.0f));
     }
 }

server/src/test/java/org/elasticsearch/cluster/routing/allocation/allocator/BalancedShardsAllocatorTests.java

@@ -558,14 +558,21 @@ public void testThresholdLimit() {
         final var badValue = (float) randomDoubleBetween(0.0, Math.nextDown(1.0f), true);
         expectThrows(
             IllegalArgumentException.class,
-            () -> new BalancedShardsAllocator(Settings.builder().put(BalancedShardsAllocator.THRESHOLD_SETTING.getKey(), badValue).build())
+            () -> new BalancerSettings(
+                ClusterSettings.createBuiltInClusterSettings(
+                    Settings.builder().put(BalancedShardsAllocator.THRESHOLD_SETTING.getKey(), badValue).build()
+                )
+            )
         );
 
         final var goodValue = (float) randomDoubleBetween(1.0, 10.0, true);
         assertEquals(
             goodValue,
-            new BalancedShardsAllocator(Settings.builder().put(BalancedShardsAllocator.THRESHOLD_SETTING.getKey(), goodValue).build())
-                .getThreshold(),
+            new BalancerSettings(
+                ClusterSettings.createBuiltInClusterSettings(
+                    Settings.builder().put(BalancedShardsAllocator.THRESHOLD_SETTING.getKey(), goodValue).build()
+                )
+            ).getThreshold(),
             0.0f
         );
     }