Tidying up

davidkyle · May 28, 2019 · 0b537c6 · 0b537c6
1 parent 47eb26a
commit 0b537c6
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 10 deletions.
diff --git a/...me/src/main/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameTransformTask.java b/...me/src/main/java/org/elasticsearch/xpack/dataframe/transforms/DataFrameTransformTask.java
@@ -238,7 +238,7 @@ public synchronized void stop() {
 
         IndexerState state = getIndexer().stop();
         if (state == IndexerState.STOPPED) {
-            getIndexer().saveState(state, () -> getIndexer().onStop());
+            getIndexer().doSaveState(state, getIndexer().getPosition(), () -> getIndexer().onStop());
         }
     }
 
@@ -534,15 +534,10 @@ protected void doSaveState(IndexerState indexerState, Map<String, Object> positi
                 return;
             }
 
-            saveState(indexerState, next);
-        }
-
-        public void saveState(IndexerState indexerState, Runnable next){
-
             final DataFrameTransformState state = new DataFrameTransformState(
                 transformTask.taskState.get(),
                 indexerState,
-                getPosition(),
+                position,
                 transformTask.currentCheckpoint.get(),
                 transformTask.stateReason.get(),
                 getProgress());

diff --git a/x-pack/plugin/src/test/resources/rest-api-spec/test/data_frame/transforms_start_stop.yml b/x-pack/plugin/src/test/resources/rest-api-spec/test/data_frame/transforms_start_stop.yml
@@ -118,7 +118,7 @@ teardown:
   - match: { count: 1 }
   - match: { transforms.0.id: "airline-transform-start-stop" }
   - match: { transforms.0.state.indexer_state: "stopped" }
-#  - match: { transforms.0.state.task_state: "stopped" }
+  - match: { transforms.0.state.task_state: "stopped" }
 
   - do:
       data_frame.start_data_frame_transform:
@@ -245,9 +245,9 @@ teardown:
         transform_id: "*"
   - match: { count: 2 }
   - match: { transforms.0.state.indexer_state: "stopped" }
-#  - match: { transforms.0.state.task_state: "stopped" }
+  - match: { transforms.0.state.task_state: "stopped" }
   - match: { transforms.1.state.indexer_state: "stopped" }
-#  - match: { transforms.1.state.task_state: "stopped" }
+  - match: { transforms.1.state.task_state: "stopped" }
 
   - do:
       data_frame.delete_data_frame_transform: