fix for delete model group API throwing incorrect error when model in…

…dex not created (#1485) (#1486) * fix for delete model group API throwing incorrect error when model index not created Signed-off-by: Bhavana Ramaram <[email protected]> (cherry picked from commit 60ef0fd) Co-authored-by: Bhavana Ramaram <[email protected]>
opensearch-project · Oct 11, 2023 · 5544681 · 5544681
1 parent 6f83b9f
commit 5544681
Showing 1 changed file with 18 additions and 15 deletions.
diff --git a/...n/src/main/java/org/opensearch/ml/action/model_group/DeleteModelGroupTransportAction.java b/...n/src/main/java/org/opensearch/ml/action/model_group/DeleteModelGroupTransportAction.java
@@ -25,7 +25,6 @@
 import org.opensearch.index.IndexNotFoundException;
 import org.opensearch.index.query.BoolQueryBuilder;
 import org.opensearch.index.query.TermQueryBuilder;
-import org.opensearch.ml.common.exception.MLResourceNotFoundException;
 import org.opensearch.ml.common.exception.MLValidationException;
 import org.opensearch.ml.common.transport.model_group.MLModelGroupDeleteAction;
 import org.opensearch.ml.common.transport.model_group.MLModelGroupDeleteRequest;
@@ -84,26 +83,14 @@ protected void doExecute(Task task, ActionRequest request, ActionListener<Delete
                     SearchRequest searchRequest = new SearchRequest(ML_MODEL_INDEX).source(searchSourceBuilder);
                     client.search(searchRequest, ActionListener.wrap(mlModels -> {
                         if (mlModels == null || mlModels.getHits().getTotalHits() == null || mlModels.getHits().getTotalHits().value == 0) {
-                            client.delete(deleteRequest, new ActionListener<DeleteResponse>() {
-                                @Override
-                                public void onResponse(DeleteResponse deleteResponse) {
-                                    log.debug("Completed Delete Model Group Request, task id:{} deleted", modelGroupId);
-                                    wrappedListener.onResponse(deleteResponse);
-                                }
-
-                                @Override
-                                public void onFailure(Exception e) {
-                                    log.error("Failed to delete ML Model Group " + modelGroupId, e);
-                                    wrappedListener.onFailure(e);
-                                }
-                            });
+                            deleteModelGroup(deleteRequest, modelGroupId, wrappedListener);
                         } else {
                             throw new MLValidationException("Cannot delete the model group when it has associated model versions");
                         }
 
                     }, e -> {
                         if (e instanceof IndexNotFoundException) {
-                            wrappedListener.onFailure(new MLResourceNotFoundException("Fail to find model group"));
+                            deleteModelGroup(deleteRequest, modelGroupId, wrappedListener);
                         } else {
                             log.error("Failed to search models with the specified Model Group Id " + modelGroupId, e);
                             wrappedListener.onFailure(e);
@@ -116,4 +103,20 @@ public void onFailure(Exception e) {
             }));
         }
     }
+
+    private void deleteModelGroup(DeleteRequest deleteRequest, String modelGroupId, ActionListener<DeleteResponse> actionListener) {
+        client.delete(deleteRequest, new ActionListener<DeleteResponse>() {
+            @Override
+            public void onResponse(DeleteResponse deleteResponse) {
+                log.debug("Completed Delete Model Group Request, task id:{} deleted", modelGroupId);
+                actionListener.onResponse(deleteResponse);
+            }
+
+            @Override
+            public void onFailure(Exception e) {
+                log.error("Failed to delete ML Model Group " + modelGroupId, e);
+                actionListener.onFailure(e);
+            }
+        });
+    }
 }