Move error logger to listener

Signed-off-by: John Mazanec <[email protected]>
opensearch-project · Apr 10, 2023 · 7f435c9 · 7f435c9
1 parent 02f7129
commit 7f435c9
Show file tree

Hide file tree

Showing 2 changed files with 8 additions and 10 deletions.
diff --git a/src/main/java/org/opensearch/knn/indices/ModelDao.java b/src/main/java/org/opensearch/knn/indices/ModelDao.java
@@ -488,7 +488,6 @@ public void delete(String modelId, ActionListener<DeleteModelResponse> listener)
             if (!isCreated()) {
                 String errorMessage = String.format("Cannot delete model [%s]. Model index [%s] does not exist", modelId, MODEL_INDEX_NAME);
                 Exception e = new ResourceNotFoundException(errorMessage);
-                logger.error(e);
                 listener.onFailure(e);
                 return;
             }
@@ -502,7 +501,6 @@ public void delete(String modelId, ActionListener<DeleteModelResponse> listener)
 
             // Get Model to check if model is in TRAINING
             get(modelId, ActionListener.wrap(getModelStep::onResponse, exception -> {
-                logger.error(exception);
                 if (exception instanceof ResourceNotFoundException) {
                     String errorMessage = String.format("Unable to delete model [%s]. Model does not exist", modelId);
                     ResourceNotFoundException resourceNotFoundException = new ResourceNotFoundException(errorMessage);
@@ -516,9 +514,7 @@ public void delete(String modelId, ActionListener<DeleteModelResponse> listener)
                 // If model is in Training state, fail delete model request
                 if (ModelState.TRAINING == getModelResponse.getModel().getModelMetadata().getState()) {
                     String errorMessage = String.format("Cannot delete model [%s]. Model is still in training", modelId);
-                    Exception e = new DeleteModelWhenInTrainStateException(errorMessage);
-                    logger.error(e);
-                    listener.onFailure(e);
+                    listener.onFailure(new DeleteModelWhenInTrainStateException(errorMessage));
                     return;
                 }
 
@@ -548,9 +544,7 @@ public void delete(String modelId, ActionListener<DeleteModelResponse> listener)
                 if (deleteResponse.getResult() != DocWriteResponse.Result.DELETED) {
                     updateModelGraveyardToDelete(modelId, true, unblockModelIdStep, Optional.empty());
                     String errorMessage = String.format("Model [%s] does not exist", modelId);
-                    Exception e = new ResourceNotFoundException(errorMessage);
-                    logger.error(e);
-                    listener.onFailure(e);
+                    listener.onFailure(new ResourceNotFoundException(errorMessage));
                     return;
                 }
 
@@ -565,7 +559,6 @@ public void delete(String modelId, ActionListener<DeleteModelResponse> listener)
                 if (removeModelFromCacheResponse.hasFailures()) {
                     String failureMessage = buildRemoveModelErrorMessage(modelId, removeModelFromCacheResponse);
                     exception = new OpenSearchException(failureMessage);
-                    logger.error(exception);
                 }
 
                 // Remove modelId from model graveyard

diff --git a/src/main/java/org/opensearch/knn/plugin/transport/DeleteModelTransportAction.java b/src/main/java/org/opensearch/knn/plugin/transport/DeleteModelTransportAction.java
@@ -11,6 +11,7 @@
 
 package org.opensearch.knn.plugin.transport;
 
+import lombok.extern.log4j.Log4j2;
 import org.opensearch.action.ActionListener;
 import org.opensearch.action.support.ActionFilters;
 import org.opensearch.action.support.HandledTransportAction;
@@ -21,6 +22,7 @@
 import org.opensearch.tasks.Task;
 import org.opensearch.transport.TransportService;
 
+@Log4j2
 public class DeleteModelTransportAction extends HandledTransportAction<DeleteModelRequest, DeleteModelResponse> {
 
     private final ModelDao modelDao;
@@ -37,7 +39,10 @@ public DeleteModelTransportAction(TransportService transportService, ActionFilte
     protected void doExecute(Task task, DeleteModelRequest request, ActionListener<DeleteModelResponse> listener) {
         ThreadContextHelper.runWithStashedThreadContext(client, () -> {
             String modelID = request.getModelID();
-            modelDao.delete(modelID, listener);
+            modelDao.delete(modelID, ActionListener.wrap(listener::onResponse, e -> {
+                log.error(e);
+                listener.onFailure(e);
+            }));
         });
     }
 }