Skip to content

Commit ebe9c95

Browse files
[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.
1 parent 891320f commit ebe9c95

File tree

1 file changed

+5
-5
lines changed

1 file changed

+5
-5
lines changed

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

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -181,7 +181,10 @@ protected void masterOperation(Task task, DeleteJobAction.Request request, Clust
181181
// The listener that will be executed at the end of the chain will notify all listeners
182182
ActionListener<AcknowledgedResponse> finalListener = ActionListener.wrap(
183183
ack -> notifyListeners(request.getJobId(), ack, null),
184-
e -> notifyListeners(request.getJobId(), null, e)
184+
e -> {
185+
notifyListeners(request.getJobId(), null, e);
186+
auditor.error(request.getJobId(), Messages.getMessage(Messages.JOB_AUDIT_DELETING_FAILED, e.getMessage()));
187+
}
185188
);
186189

187190
ActionListener<Boolean> markAsDeletingListener = ActionListener.wrap(
@@ -192,10 +195,7 @@ protected void masterOperation(Task task, DeleteJobAction.Request request, Clust
192195
normalDeleteJob(parentTaskClient, request, finalListener);
193196
}
194197
},
195-
e -> {
196-
auditor.error(request.getJobId(), Messages.getMessage(Messages.JOB_AUDIT_DELETING_FAILED, e.getMessage()));
197-
finalListener.onFailure(e);
198-
});
198+
finalListener::onFailure);
199199

200200
ActionListener<Boolean> jobExistsListener = ActionListener.wrap(
201201
response -> {

0 commit comments

Comments
 (0)