[ML] Audit all errors during job deletion (#37933)

This commit moves the auditing of job deletion related errors to the final listener in the job delete action. This ensures any error that occurs during job deletion is audited.
elastic · Jan 29, 2019 · ebe9c95 · ebe9c95
1 parent 891320f
commit ebe9c95
Showing 1 changed file with 5 additions and 5 deletions.
diff --git a/...k/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteJobAction.java b/...k/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/action/TransportDeleteJobAction.java
@@ -181,7 +181,10 @@ protected void masterOperation(Task task, DeleteJobAction.Request request, Clust
         // The listener that will be executed at the end of the chain will notify all listeners
         ActionListener<AcknowledgedResponse> finalListener = ActionListener.wrap(
                 ack -> notifyListeners(request.getJobId(), ack, null),
-                e -> notifyListeners(request.getJobId(), null, e)
+                e -> {
+                    notifyListeners(request.getJobId(), null, e);
+                    auditor.error(request.getJobId(), Messages.getMessage(Messages.JOB_AUDIT_DELETING_FAILED, e.getMessage()));
+                }
         );
 
         ActionListener<Boolean> markAsDeletingListener = ActionListener.wrap(
@@ -192,10 +195,7 @@ protected void masterOperation(Task task, DeleteJobAction.Request request, Clust
                         normalDeleteJob(parentTaskClient, request, finalListener);
                     }
                 },
-                e -> {
-                    auditor.error(request.getJobId(), Messages.getMessage(Messages.JOB_AUDIT_DELETING_FAILED, e.getMessage()));
-                    finalListener.onFailure(e);
-                });
+                finalListener::onFailure);
 
         ActionListener<Boolean> jobExistsListener = ActionListener.wrap(
             response -> {