From cf6bca96db899fd81c91cb6c4bba2717f9fb7d3c Mon Sep 17 00:00:00 2001
From: Zachary Tong <zach@zacharytong.com>
Date: Thu, 23 Mar 2017 12:41:33 -0400
Subject: [PATCH] Remove norelease and adjust audit logging

Audit logging in wrong location.  Norelease removed because the proper solution
will take some more work, and this edge-case is not likely to be run into frequently.

More details in elastic/x-pack-elasticsearch#818

Original commit: elastic/x-pack-elasticsearch@ab0d731abf46256a0105972e5c82d0a8d9e0a4fd
---
 .../xpack/ml/action/DeleteModelSnapshotAction.java         | 7 ++-----
 1 file changed, 2 insertions(+), 5 deletions(-)

diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteModelSnapshotAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteModelSnapshotAction.java
index 8c9a2f6f4f9..1e274a39ef1 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteModelSnapshotAction.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteModelSnapshotAction.java
@@ -168,9 +168,6 @@ public class DeleteModelSnapshotAction extends Action<DeleteModelSnapshotAction.
                         ModelSnapshot deleteCandidate = deleteCandidates.get(0);
 
                         // Verify the snapshot is not being used
-                        //
-                        // NORELEASE: technically, this could be stale and refuse a delete, but I think that's acceptable
-                        // since it is non-destructive
                         QueryPage<Job> job = jobManager.getJob(request.getJobId(), clusterService.state());
                         if (job.count() > 0) {
                             String currentModelInUse = job.results().get(0).getModelSnapshotId();
@@ -186,6 +183,8 @@ public class DeleteModelSnapshotAction extends Action<DeleteModelSnapshotAction.
                         deleter.commit(new ActionListener<BulkResponse>() {
                             @Override
                             public void onResponse(BulkResponse bulkResponse) {
+                                auditor.info(request.getJobId(), Messages.getMessage(Messages.JOB_AUDIT_SNAPSHOT_DELETED,
+                                        deleteCandidate.getDescription()));
                                 // We don't care about the bulk response, just that it succeeded
                                 listener.onResponse(new DeleteModelSnapshotAction.Response(true));
                             }
@@ -196,8 +195,6 @@ public class DeleteModelSnapshotAction extends Action<DeleteModelSnapshotAction.
                             }
                         });
 
-                        auditor.info(request.getJobId(), Messages.getMessage(Messages.JOB_AUDIT_SNAPSHOT_DELETED,
-                                deleteCandidate.getDescription()));
                     }, listener::onFailure);
         }
     }