Rename exception and update exception message

Author: dan-rubinstein

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

@@ -64,7 +64,7 @@
 import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper;
 import org.elasticsearch.xpack.core.ml.utils.TransportVersionUtils;
 import org.elasticsearch.xpack.ml.MachineLearning;
-import org.elasticsearch.xpack.ml.inference.assignment.ModelDeploymentScaleUpException;
+import org.elasticsearch.xpack.ml.inference.assignment.ModelDeploymentTimeoutException;
 import org.elasticsearch.xpack.ml.inference.assignment.TrainedModelAssignmentService;
 import org.elasticsearch.xpack.ml.inference.persistence.TrainedModelDefinitionDoc;
 import org.elasticsearch.xpack.ml.notifications.InferenceAuditor;
@@ -351,14 +351,14 @@ public void onFailure(Exception e) {
                 @Override
                 public void onTimeout(TimeValue timeout) {
                     onFailure(
-                        new ModelDeploymentScaleUpException(
+                        new ModelDeploymentTimeoutException(
                             format(
                                 "Timed out after [%s] waiting for trained model deployment [%s] to start. "
-                                    + "Please ensure the trained model deployment has started and try again.",
+                                    + "Use the trained model stats API to track the state of the deployment "
+                                    + "and try again once it has started.",
                                 request.getTimeout(),
                                 request.getDeploymentId()
-                            ),
-                            RestStatus.REQUEST_TIMEOUT
+                            )
                         )
                     );
                 }

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

@@ -21,7 +21,7 @@
 import org.elasticsearch.xpack.core.ml.inference.assignment.TrainedModelAssignment;
 import org.elasticsearch.xpack.core.ml.inference.assignment.TrainedModelAssignmentMetadata;
 import org.elasticsearch.xpack.core.ml.utils.ExceptionsHelper;
-import org.elasticsearch.xpack.ml.inference.assignment.ModelDeploymentScaleUpException;
+import org.elasticsearch.xpack.ml.inference.assignment.ModelDeploymentTimeoutException;
 import org.elasticsearch.xpack.ml.inference.assignment.TrainedModelAssignmentService;
 
 import java.util.HashMap;
@@ -194,14 +194,13 @@ public void onFailure(Exception e) {
         @Override
         public void onTimeout(TimeValue timeout) {
             onFailure(
-                new ModelDeploymentScaleUpException(
+                new ModelDeploymentTimeoutException(
                     format(
                         "Timed out after [%s] waiting for trained model deployment [%s] to start. "
-                            + "Please ensure the trained model deployment has started and try again.",
+                            + "Use the trained model stats API to track the state of the deployment and try again once it has started.",
                         timeout,
                         request.deploymentId()
-                    ),
-                    RestStatus.REQUEST_TIMEOUT
+                    )
                 )
             );
         }

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/ModelDeploymentScaleUpException.java renamed to x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/ModelDeploymentTimeoutException.java

@@ -10,8 +10,8 @@
 import org.elasticsearch.ElasticsearchStatusException;
 import org.elasticsearch.rest.RestStatus;
 
-public class ModelDeploymentScaleUpException extends ElasticsearchStatusException {
-    public ModelDeploymentScaleUpException(String message, RestStatus status) {
-        super(message, status);
+public class ModelDeploymentTimeoutException extends ElasticsearchStatusException {
+    public ModelDeploymentTimeoutException(String message) {
+        super(message, RestStatus.REQUEST_TIMEOUT);
     }
 }

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/inference/assignment/TrainedModelAssignmentService.java

@@ -24,7 +24,6 @@
 import org.elasticsearch.core.Nullable;
 import org.elasticsearch.core.TimeValue;
 import org.elasticsearch.node.NodeClosedException;
-import org.elasticsearch.rest.RestStatus;
 import org.elasticsearch.threadpool.ThreadPool;
 import org.elasticsearch.transport.ConnectTransportException;
 import org.elasticsearch.xpack.core.ml.action.CreateTrainedModelAssignmentAction;
@@ -121,13 +120,12 @@ public void onTimeout(TimeValue timeout) {
     public interface WaitForAssignmentListener extends ActionListener<TrainedModelAssignment> {
         default void onTimeout(TimeValue timeout) {
             onFailure(
-                new ModelDeploymentScaleUpException(
+                new ModelDeploymentTimeoutException(
                     format(
                         "Timed out after [%s] waiting for trained model deployment to start. "
-                            + "Please ensure the trained model deployment has started and try again.",
+                            + "Use the trained model stats API to track the state of the deployment and try again once it has started.",
                         timeout
-                    ),
-                    RestStatus.REQUEST_TIMEOUT
+                    )
                 )
             );
         }