From 02e6acf2d21a1b0c05c151fd315edb61cdf1c380 Mon Sep 17 00:00:00 2001 From: Benjamin Trent Date: Thu, 6 Jun 2019 08:33:49 -0500 Subject: [PATCH] [ML] [Data Frame] Adding pending task wait to the hlrc cleanup (#42907) (#42930) --- .../java/org/elasticsearch/client/DataFrameTransformIT.java | 3 ++- .../documentation/DataFrameTransformDocumentationIT.java | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/DataFrameTransformIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/DataFrameTransformIT.java index 31027e7c0f1..5e00dfb8ed3 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/DataFrameTransformIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/DataFrameTransformIT.java @@ -140,7 +140,7 @@ public class DataFrameTransformIT extends ESRestHighLevelClientTestCase { } @After - public void cleanUpTransforms() throws IOException { + public void cleanUpTransforms() throws Exception { for (String transformId : transformsToClean) { highLevelClient().dataFrame().stopDataFrameTransform( new StopDataFrameTransformRequest(transformId, Boolean.TRUE, null), RequestOptions.DEFAULT); @@ -152,6 +152,7 @@ public class DataFrameTransformIT extends ESRestHighLevelClientTestCase { } transformsToClean = new ArrayList<>(); + waitForPendingTasks(adminClient()); } public void testCreateDelete() throws IOException { diff --git a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/DataFrameTransformDocumentationIT.java b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/DataFrameTransformDocumentationIT.java index fca5881969b..f0dfda1d589 100644 --- a/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/DataFrameTransformDocumentationIT.java +++ b/client/rest-high-level/src/test/java/org/elasticsearch/client/documentation/DataFrameTransformDocumentationIT.java @@ -74,7 +74,7 @@ public class DataFrameTransformDocumentationIT extends ESRestHighLevelClientTest private List transformsToClean = new ArrayList<>(); @After - public void cleanUpTransforms() throws IOException { + public void cleanUpTransforms() throws Exception { for (String transformId : transformsToClean) { highLevelClient().dataFrame().stopDataFrameTransform( new StopDataFrameTransformRequest(transformId, Boolean.TRUE, TimeValue.timeValueSeconds(20)), RequestOptions.DEFAULT); @@ -86,6 +86,7 @@ public class DataFrameTransformDocumentationIT extends ESRestHighLevelClientTest } transformsToClean = new ArrayList<>(); + waitForPendingTasks(adminClient()); } private void createIndex(String indexName) throws IOException {