Allow float settings to be configured with other settings as default

Author: nicktindall

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

@@ -1367,8 +1367,16 @@ public static Setting<Float> floatSetting(String key, float defaultValue, Proper
     }
 
     public static Setting<Float> floatSetting(String key, float defaultValue, float minValue, Property... properties) {
+        return new Setting<>(key, Float.toString(defaultValue), floatParser(key, minValue, properties), properties);
+    }
+
+    public static Setting<Float> floatSetting(String key, Setting<Float> fallbackSetting, float minValue, Property... properties) {
+        return new Setting<>(key, fallbackSetting, floatParser(key, minValue, properties), properties);
+    }
+
+    private static Function<String, Float> floatParser(String key, float minValue, Property... properties) {
         final boolean isFiltered = isFiltered(properties);
-        return new Setting<>(key, Float.toString(defaultValue), (s) -> {
+        return (s) -> {
             float value = Float.parseFloat(s);
             if (value < minValue) {
                 String err = "Failed to parse value"
@@ -1380,7 +1388,7 @@ public static Setting<Float> floatSetting(String key, float defaultValue, float
                 throw new IllegalArgumentException(err);
             }
             return value;
-        }, properties);
+        };
     }
 
     private static boolean isFiltered(Property[] properties) {

server/src/test/java/org/elasticsearch/common/settings/SettingTests.java

@@ -387,6 +387,28 @@ public void testFilteredBooleanSetting() {
         assertNull(e.getCause());
     }
 
+    public void testFloatSettingWithOtherSettingAsDefault() {
+        float defaultValue = randomFloat();
+        Setting<Float> defaultSetting = Setting.floatSetting("float_val.default", defaultValue);
+        Setting<Float> floatSetting = Setting.floatSetting("float_val", defaultSetting, Float.MIN_VALUE);
+        assertThat(floatSetting.get(Settings.builder().build()), equalTo(defaultValue));
+        float configuredDefaultValue = randomValueOtherThan(defaultValue, ESTestCase::randomFloat);
+        assertThat(
+            floatSetting.get(Settings.builder().put("float_val.default", configuredDefaultValue).build()),
+            equalTo(configuredDefaultValue)
+        );
+        float configuredSettingValue = randomValueOtherThanMany(
+            v -> v != configuredDefaultValue && v != defaultValue,
+            ESTestCase::randomFloat
+        );
+        assertThat(
+            floatSetting.get(
+                Settings.builder().put("float_val.default", configuredDefaultValue).put("float_val", configuredSettingValue).build()
+            ),
+            equalTo(configuredSettingValue)
+        );
+    }
+
     private enum TestEnum {
         ON,
         OFF