[ML] Delete job document

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

@@ -225,7 +225,8 @@ private void normalDeleteJob(ParentTaskAssigningClient parentTaskClient, DeleteJ
 
         // Step 3. When the physical storage has been deleted, delete the job config document
         // -------
-        CheckedConsumer<Boolean, Exception> deleteJobStateHandler = response -> jobConfigProvider.deleteJob(jobId,
+        // Don't report an error if the document has already been deleted
+        CheckedConsumer<Boolean, Exception> deleteJobStateHandler = response -> jobConfigProvider.deleteJob(jobId, false,
                 ActionListener.wrap(
                         deleteResponse -> apiResponseHandler.accept(Boolean.TRUE),
                         listener::onFailure

x-pack/plugin/ml/src/main/java/org/elasticsearch/xpack/ml/job/persistence/JobConfigProvider.java

@@ -208,16 +208,37 @@ public void onFailure(Exception e) {
     }
 
     /**
-     * Delete the anomaly detector job config document
+     * Delete the anomaly detector job config document.
+     * {@code errorIfMissing} controls whether or not an error if return
+     * if the document does not exist.
      *
      * @param jobId The job id
+     * @param errorIfMissing If the job document does not exist and this this true
+     *                       listener fails with a ResourceNotFoundException else
+     *                       the DeleteResponse is always return.
      * @param actionListener Deleted job listener
      */
-    public void deleteJob(String jobId,  ActionListener<DeleteResponse> actionListener) {
+    public void deleteJob(String jobId, boolean errorIfMissing, ActionListener<DeleteResponse> actionListener) {
         DeleteRequest request = new DeleteRequest(AnomalyDetectorsIndex.configIndexName(),
                 ElasticsearchMappings.DOC_TYPE, Job.documentId(jobId));
 
-        executeAsyncWithOrigin(client, ML_ORIGIN, DeleteAction.INSTANCE, request, actionListener);
+        executeAsyncWithOrigin(client, ML_ORIGIN, DeleteAction.INSTANCE, request, new ActionListener<DeleteResponse>() {
+            @Override
+            public void onResponse(DeleteResponse deleteResponse) {
+                if (errorIfMissing) {
+                    if (deleteResponse.getResult() == DocWriteResponse.Result.NOT_FOUND) {
+                        actionListener.onFailure(ExceptionsHelper.missingJobException(jobId));
+                        return;
+                    }
+                    assert deleteResponse.getResult() == DocWriteResponse.Result.DELETED;
+                }
+                actionListener.onResponse(deleteResponse);
+            }
+            @Override
+            public void onFailure(Exception e) {
+                actionListener.onFailure(e);
+            }
+        });
     }
 
     /**

x-pack/plugin/ml/src/test/java/org/elasticsearch/xpack/ml/integration/JobConfigProviderIT.java

@@ -158,7 +158,7 @@ public void testCrud() throws InterruptedException {
 
         // Delete Job
         AtomicReference<DeleteResponse> deleteJobResponseHolder = new AtomicReference<>();
-        blockingCall(actionListener -> jobConfigProvider.deleteJob(jobId, actionListener),
+        blockingCall(actionListener -> jobConfigProvider.deleteJob(jobId, true, actionListener),
                 deleteJobResponseHolder, exceptionHolder);
         assertNull(exceptionHolder.get());
         assertThat(deleteJobResponseHolder.get().getResult(), equalTo(DocWriteResponse.Result.DELETED));
@@ -172,7 +172,15 @@ public void testCrud() throws InterruptedException {
         // Delete deleted job
         deleteJobResponseHolder.set(null);
         exceptionHolder.set(null);
-        blockingCall(actionListener -> jobConfigProvider.deleteJob(jobId, actionListener),
+        blockingCall(actionListener -> jobConfigProvider.deleteJob(jobId, true, actionListener),
+                deleteJobResponseHolder, exceptionHolder);
+        assertNull(deleteJobResponseHolder.get());
+        assertEquals(ResourceNotFoundException.class, exceptionHolder.get().getClass());
+
+        // and again with errorIfMissing set false
+        deleteJobResponseHolder.set(null);
+        exceptionHolder.set(null);
+        blockingCall(actionListener -> jobConfigProvider.deleteJob(jobId, false, actionListener),
                 deleteJobResponseHolder, exceptionHolder);
         assertEquals(DocWriteResponse.Result.NOT_FOUND, deleteJobResponseHolder.get().getResult());
     }