[Transform] Make Transform Feature Reset really wait for all the tasks (

elastic#100624) (elastic#100652)
gmarouli · Oct 11, 2023 · 5bdf4ac · 5bdf4ac
1 parent 937f2db
commit 5bdf4ac
Show file tree

Hide file tree

Showing 3 changed files with 8 additions and 2 deletions.
diff --git a/docs/changelog/100624.yaml b/docs/changelog/100624.yaml
@@ -0,0 +1,5 @@
+pr: 100624
+summary: Make Transform Feature Reset really wait for all the tasks
+area: Transform
+type: bug
+issues: []
diff --git a/...c/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TestFeatureResetIT.java b/...c/javaRestTest/java/org/elasticsearch/xpack/transform/integration/TestFeatureResetIT.java
@@ -101,7 +101,8 @@ public void testTransformFeatureReset() throws Exception {
         assertThat((Integer) getTransforms("_all").get("count"), equalTo(0));
 
         // assert transform indices are gone
-        assertThat(ESRestTestCase.entityAsMap(adminClient().performRequest(new Request("GET", ".transform-*"))), is(anEmptyMap()));
+        Map<String, Object> transformIndices = ESRestTestCase.entityAsMap(adminClient().performRequest(new Request("GET", ".transform-*")));
+        assertThat("Indices were: " + transformIndices, transformIndices, is(anEmptyMap()));
     }
 
 }
diff --git a/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/Transform.java b/x-pack/plugin/transform/src/main/java/org/elasticsearch/xpack/transform/Transform.java
@@ -426,7 +426,7 @@ public void cleanUpFeature(
                 client.admin()
                     .cluster()
                     .prepareListTasks()
-                    .setActions(TransformField.TASK_NAME)
+                    .setActions(TransformField.TASK_NAME + "*")
                     .setWaitForCompletion(true)
                     .execute(ActionListener.wrap(listTransformTasks -> {
                         listTransformTasks.rethrowFailures("Waiting for transform tasks");