From 5a70eac6e86ee2333d6f5cc3acd7eed39c69ede0 Mon Sep 17 00:00:00 2001
From: Dimitris Athanasiou <dimitris@elastic.co>
Date: Fri, 28 Apr 2017 17:53:59 +0100
Subject: [PATCH] [ML] Delete and Update datafeed actions should use current
 cluster state (elastic/x-pack-elasticsearch#1254)

relates elastic/x-pack-elasticsearch#1253

Original commit: elastic/x-pack-elasticsearch@bdf695e6940a8bf9e1169e6d5f02265d0fcef91a
---
 .../elasticsearch/xpack/ml/action/DeleteDatafeedAction.java | 6 +++---
 .../elasticsearch/xpack/ml/action/UpdateDatafeedAction.java | 4 ++--
 .../java/org/elasticsearch/xpack/ml/job/JobManager.java     | 1 -
 3 files changed, 5 insertions(+), 6 deletions(-)

diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteDatafeedAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteDatafeedAction.java
index b68076b422a..233dcbb07ee 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteDatafeedAction.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/DeleteDatafeedAction.java
@@ -169,12 +169,12 @@ public class DeleteDatafeedAction extends Action<DeleteDatafeedAction.Request, D
 
                         @Override
                         public ClusterState execute(ClusterState currentState) throws Exception {
-                            MlMetadata currentMetadata = state.getMetaData().custom(MlMetadata.TYPE);
+                            MlMetadata currentMetadata = currentState.getMetaData().custom(MlMetadata.TYPE);
                             PersistentTasksCustomMetaData persistentTasks =
-                                    state.getMetaData().custom(PersistentTasksCustomMetaData.TYPE);
+                                    currentState.getMetaData().custom(PersistentTasksCustomMetaData.TYPE);
                             MlMetadata newMetadata = new MlMetadata.Builder(currentMetadata)
                                     .removeDatafeed(request.getDatafeedId(), persistentTasks).build();
-                            return ClusterState.builder(state).metaData(
+                            return ClusterState.builder(currentState).metaData(
                                     MetaData.builder(currentState.getMetaData()).putCustom(MlMetadata.TYPE, newMetadata).build())
                                     .build();
                         }
diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateDatafeedAction.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateDatafeedAction.java
index 3dceeeb03f8..95d43ecb8b5 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateDatafeedAction.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/action/UpdateDatafeedAction.java
@@ -160,9 +160,9 @@ public class UpdateDatafeedAction extends Action<UpdateDatafeedAction.Request, P
                         @Override
                         public ClusterState execute(ClusterState currentState) throws Exception {
                             DatafeedUpdate update = request.getUpdate();
-                            MlMetadata currentMetadata = state.getMetaData().custom(MlMetadata.TYPE);
+                            MlMetadata currentMetadata = currentState.getMetaData().custom(MlMetadata.TYPE);
                             PersistentTasksCustomMetaData persistentTasks =
-                                    state.getMetaData().custom(PersistentTasksCustomMetaData.TYPE);
+                                    currentState.getMetaData().custom(PersistentTasksCustomMetaData.TYPE);
                             MlMetadata newMetadata = new MlMetadata.Builder(currentMetadata)
                                     .updateDatafeed(update, persistentTasks).build();
                             updatedDatafeed = newMetadata.getDatafeed(update.getId());
diff --git a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java
index 92842a31f33..39df331e4b9 100644
--- a/plugin/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java
+++ b/plugin/src/main/java/org/elasticsearch/xpack/ml/job/JobManager.java
@@ -33,7 +33,6 @@ import org.elasticsearch.xpack.ml.job.config.JobUpdate;
 import org.elasticsearch.xpack.ml.job.messages.Messages;
 import org.elasticsearch.xpack.ml.job.persistence.AnomalyDetectorsIndex;
 import org.elasticsearch.xpack.ml.job.persistence.JobProvider;
-import org.elasticsearch.xpack.ml.job.persistence.JobResultsPersister;
 import org.elasticsearch.xpack.ml.job.persistence.JobStorageDeletionTask;
 import org.elasticsearch.xpack.ml.job.process.autodetect.state.ModelSnapshot;
 import org.elasticsearch.xpack.ml.notifications.Auditor;