Reverting trigger time, reducing mins

Author: prwhelan

docs/changelog/128914.yaml

@@ -1,5 +1,5 @@
 pr: 128914
-summary: Set Adaptive Allocations Scale to Zero to 24h
+summary: Make Adaptive Allocations Scale to Zero configurable and set default to 24h
 area: Machine Learning
 type: enhancement
 issues: []

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/MachineLearning.java

@@ -739,25 +739,14 @@ public void loadExtensions(ExtensionLoader loader) {
         Setting.Property.NodeScope
     );
 
-    /**
-     * The time interval between the adaptive allocations triggers.
-     * This setting requires a reboot to take effect, as it is only consumed during startup.
-     */
-    public static final Setting<TimeValue> DEFAULT_TIME_INTERVAL = Setting.timeSetting(
-        "xpack.ml.trained_models.adaptive_allocations.trigger_time",
-        TimeValue.timeValueSeconds(10),
-        TimeValue.timeValueSeconds(10),
-        Setting.Property.NodeScope
-    );
-
     /**
      * The time that has to pass after scaling up, before scaling down is allowed.
      * Note that the ML autoscaling has its own cooldown time to release the hardware.
      */
     public static final Setting<TimeValue> SCALE_UP_COOLDOWN_TIME = Setting.timeSetting(
         "xpack.ml.trained_models.adaptive_allocations.scale_up_cooldown_time",
         TimeValue.timeValueMinutes(5),
-        TimeValue.timeValueMinutes(5),
+        TimeValue.timeValueMinutes(1),
         Property.Dynamic,
         Setting.Property.NodeScope
     );
@@ -772,7 +761,7 @@ public void loadExtensions(ExtensionLoader loader) {
     public static final Setting<TimeValue> SCALE_TO_ZERO_AFTER_NO_REQUESTS_TIME = Setting.timeSetting(
         "xpack.ml.trained_models.adaptive_allocations.scale_to_zero_time",
         TimeValue.timeValueHours(24),
-        TimeValue.timeValueMinutes(15),
+        TimeValue.timeValueMinutes(1),
         Property.Dynamic,
         Setting.Property.NodeScope
     );
@@ -853,7 +842,6 @@ public List<Setting<?>> getSettings() {
             DELAYED_DATA_CHECK_FREQ,
             DUMMY_ENTITY_MEMORY,
             DUMMY_ENTITY_PROCESSORS,
-            DEFAULT_TIME_INTERVAL,
             SCALE_UP_COOLDOWN_TIME,
             SCALE_TO_ZERO_AFTER_NO_REQUESTS_TIME
         );

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/adaptiveallocations/AdaptiveAllocationsScalerService.java

@@ -181,6 +181,11 @@ Collection<DoubleWithAttributes> observeDouble(Function<AdaptiveAllocationsScale
         }
     }
 
+    /**
+     * The time interval between the adaptive allocations triggers.
+     */
+    private static final long DEFAULT_TIME_INTERVAL_SECONDS = 10;
+
     private static final Logger logger = LogManager.getLogger(AdaptiveAllocationsScalerService.class);
 
     private final long timeIntervalSeconds;
@@ -218,7 +223,7 @@ public AdaptiveAllocationsScalerService(
             inferenceAuditor,
             meterRegistry,
             isNlpEnabled,
-            MachineLearning.DEFAULT_TIME_INTERVAL.get(settings).getSeconds(),
+            DEFAULT_TIME_INTERVAL_SECONDS,
             new AtomicLong(MachineLearning.SCALE_TO_ZERO_AFTER_NO_REQUESTS_TIME.get(settings).getSeconds()),
             new AtomicLong(MachineLearning.SCALE_UP_COOLDOWN_TIME.get(settings).getMillis())
         );