fix error code when failed to delete model

Signed-off-by: Bhavana Ramaram <[email protected]>
rbhavna · Feb 6, 2024 · 9064ba1 · 9064ba1
1 parent de0fd99
commit 9064ba1
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 6 deletions.
diff --git a/plugin/src/main/java/org/opensearch/ml/action/models/DeleteModelTransportAction.java b/plugin/src/main/java/org/opensearch/ml/action/models/DeleteModelTransportAction.java
@@ -128,8 +128,9 @@ protected void doExecute(Task task, ActionRequest request, ActionListener<Delete
                                 } else {
                                     wrappedListener
                                         .onFailure(
-                                            new Exception(
-                                                "Model cannot be deleted in deploying or deployed state. Try undeploy model first then delete"
+                                            new OpenSearchStatusException(
+                                                "Model cannot be deleted in deploying or deployed state. Try undeploy model first then delete",
+                                                RestStatus.BAD_REQUEST
                                             )
                                         );
                                 }
@@ -150,8 +151,9 @@ protected void doExecute(Task task, ActionRequest request, ActionListener<Delete
                                     } else {
                                         wrappedListener
                                             .onFailure(
-                                                new Exception(
-                                                    "Model cannot be deleted in deploying or deployed state. Try undeploy model first then delete"
+                                                new OpenSearchStatusException(
+                                                    "Model cannot be deleted in deploying or deployed state. Try undeploy model first then delete",
+                                                    RestStatus.BAD_REQUEST
                                                 )
                                             );
                                     }
@@ -167,7 +169,7 @@ protected void doExecute(Task task, ActionRequest request, ActionListener<Delete
                 } else {
                     wrappedListener.onFailure(new OpenSearchStatusException("Failed to find model", RestStatus.NOT_FOUND));
                 }
-            }, e -> { wrappedListener.onFailure(e); }));
+            }, e -> { wrappedListener.onFailure((new OpenSearchStatusException("Failed to find model", RestStatus.NOT_FOUND))); }));
         } catch (Exception e) {
             log.error("Failed to delete ML model " + modelId, e);
             actionListener.onFailure(e);

diff --git a/plugin/src/test/java/org/opensearch/ml/action/models/DeleteModelTransportActionTests.java b/plugin/src/test/java/org/opensearch/ml/action/models/DeleteModelTransportActionTests.java
@@ -280,7 +280,7 @@ public void testDeleteModel_ModelNotFoundException() throws IOException {
         deleteModelTransportAction.doExecute(null, mlModelDeleteRequest, actionListener);
         ArgumentCaptor<Exception> argumentCaptor = ArgumentCaptor.forClass(Exception.class);
         verify(actionListener).onFailure(argumentCaptor.capture());
-        assertEquals("Fail to find model", argumentCaptor.getValue().getMessage());
+        assertEquals("Failed to find model", argumentCaptor.getValue().getMessage());
     }
 
     public void testDeleteModel_ResourceNotFoundException() throws IOException {