Skip to content

Commit 67e1bd4

Browse files
authored
Clean up lingering tasks after DatafeedJobsIT. (#120040)
1 parent 838a41a commit 67e1bd4

File tree

1 file changed

+6
-0
lines changed
  • x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration

1 file changed

+6
-0
lines changed

x-pack/plugin/ml/qa/native-multi-node-tests/src/javaRestTest/java/org/elasticsearch/xpack/ml/integration/DatafeedJobsIT.java

+6
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,8 @@
1111
import org.elasticsearch.ElasticsearchException;
1212
import org.elasticsearch.ElasticsearchStatusException;
1313
import org.elasticsearch.ResourceNotFoundException;
14+
import org.elasticsearch.action.admin.cluster.node.tasks.cancel.CancelTasksRequest;
15+
import org.elasticsearch.action.admin.cluster.node.tasks.cancel.TransportCancelTasksAction;
1416
import org.elasticsearch.action.search.SearchRequest;
1517
import org.elasticsearch.action.support.master.AcknowledgedResponse;
1618
import org.elasticsearch.common.ReferenceDocs;
@@ -80,6 +82,10 @@ public class DatafeedJobsIT extends MlNativeAutodetectIntegTestCase {
8082
public void cleanup() {
8183
updateClusterSettings(Settings.builder().putNull("logger.org.elasticsearch.xpack.ml.datafeed"));
8284
cleanUp();
85+
// Race conditions between closing and killing tasks in these tests,
86+
// sometimes result in lingering persistent tasks (such as "_close"),
87+
// which cause subsequent tests to fail.
88+
client().execute(TransportCancelTasksAction.TYPE, new CancelTasksRequest());
8389
}
8490

8591
public void testLookbackOnly() throws Exception {

0 commit comments

Comments
 (0)