Skip to content

Commit 46fa424

Browse files
[ML] Remove scale from 0 feature flag (#116936)
Co-authored-by: Elastic Machine <[email protected]>
1 parent fd0cdf0 commit 46fa424

File tree

3 files changed

+6
-30
lines changed

3 files changed

+6
-30
lines changed

test/test-clusters/src/main/java/org/elasticsearch/test/cluster/FeatureFlag.java

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,7 @@
1818
public enum FeatureFlag {
1919
TIME_SERIES_MODE("es.index_mode_feature_flag_registered=true", Version.fromString("8.0.0"), null),
2020
FAILURE_STORE_ENABLED("es.failure_store_feature_flag_enabled=true", Version.fromString("8.12.0"), null),
21-
SUB_OBJECTS_AUTO_ENABLED("es.sub_objects_auto_feature_flag_enabled=true", Version.fromString("8.16.0"), null),
22-
ML_SCALE_FROM_ZERO("es.ml_scale_from_zero_feature_flag_enabled=true", Version.fromString("8.16.0"), null);
21+
SUB_OBJECTS_AUTO_ENABLED("es.sub_objects_auto_feature_flag_enabled=true", Version.fromString("8.16.0"), null);
2322

2423
public final String systemProperty;
2524
public final Version from;

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

Lines changed: 5 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,6 @@
4545
import org.elasticsearch.xpack.ml.MachineLearning;
4646
import org.elasticsearch.xpack.ml.inference.InferenceWaitForAllocation;
4747
import org.elasticsearch.xpack.ml.inference.adaptiveallocations.AdaptiveAllocationsScalerService;
48-
import org.elasticsearch.xpack.ml.inference.adaptiveallocations.ScaleFromZeroFeatureFlag;
4948
import org.elasticsearch.xpack.ml.inference.assignment.TrainedModelAssignmentService;
5049
import org.elasticsearch.xpack.ml.inference.loadingservice.LocalModel;
5150
import org.elasticsearch.xpack.ml.inference.loadingservice.ModelLoadingService;
@@ -277,13 +276,11 @@ private void inferAgainstAllocatedModel(
277276
boolean starting = adaptiveAllocationsScalerService.maybeStartAllocation(assignment);
278277
if (starting) {
279278
message += "; starting deployment of one allocation";
280-
281-
if (ScaleFromZeroFeatureFlag.isEnabled()) {
282-
waitForAllocation.waitForAssignment(
283-
new InferenceWaitForAllocation.WaitingRequest(request, responseBuilder, parentTaskId, listener)
284-
);
285-
return;
286-
}
279+
logger.debug(message);
280+
waitForAllocation.waitForAssignment(
281+
new InferenceWaitForAllocation.WaitingRequest(request, responseBuilder, parentTaskId, listener)
282+
);
283+
return;
287284
}
288285

289286
logger.debug(message);

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

Lines changed: 0 additions & 20 deletions
This file was deleted.

0 commit comments

Comments
 (0)