for testing

Author: davidkyle

x-pack/plugin/inference/src/main/java/org/elasticsearch/xpack/inference/DefaultElserFeatureFlag.java

@@ -16,6 +16,7 @@ private DefaultElserFeatureFlag() {}
     private static final FeatureFlag FEATURE_FLAG = new FeatureFlag("inference_default_elser");
 
     public static boolean isEnabled() {
-        return FEATURE_FLAG.isEnabled();
+        return true;
+        // return FEATURE_FLAG.isEnabled();
     }
 }

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

@@ -45,7 +45,6 @@
 import org.elasticsearch.xpack.ml.MachineLearning;
 import org.elasticsearch.xpack.ml.inference.InferenceWaitForAllocation;
 import org.elasticsearch.xpack.ml.inference.adaptiveallocations.AdaptiveAllocationsScalerService;
-import org.elasticsearch.xpack.ml.inference.adaptiveallocations.ScaleFromZeroFeatureFlag;
 import org.elasticsearch.xpack.ml.inference.assignment.TrainedModelAssignmentService;
 import org.elasticsearch.xpack.ml.inference.loadingservice.LocalModel;
 import org.elasticsearch.xpack.ml.inference.loadingservice.ModelLoadingService;
@@ -278,12 +277,11 @@ private void inferAgainstAllocatedModel(
             if (starting) {
                 message += "; starting deployment of one allocation";
 
-                if (ScaleFromZeroFeatureFlag.isEnabled()) {
-                    waitForAllocation.waitForAssignment(
-                        new InferenceWaitForAllocation.WaitingRequest(request, responseBuilder, parentTaskId, listener)
-                    );
-                    return;
-                }
+                waitForAllocation.waitForAssignment(
+                    new InferenceWaitForAllocation.WaitingRequest(request, responseBuilder, parentTaskId, listener)
+                );
+                logger.debug(message);
+                return;
             }
 
             logger.debug(message);