Skip to content

Commit e033439

Browse files
authored
Datafeed jobs it wait for task cancel (elastic#120177)
* Fix task cancellation in DatafeedJobsIT. * fix * unmute DatafeedJobsIT
1 parent 7972d85 commit e033439

File tree

2 files changed

+6
-5
lines changed

2 files changed

+6
-5
lines changed

muted-tests.yml

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -232,8 +232,6 @@ tests:
232232
- class: org.elasticsearch.xpack.ilm.actions.SearchableSnapshotActionIT
233233
method: testUpdatePolicyToAddPhasesYieldsInvalidActionsToBeSkipped
234234
issue: https://github.com/elastic/elasticsearch/issues/118406
235-
- class: org.elasticsearch.xpack.ml.integration.DatafeedJobsIT
236-
issue: https://github.com/elastic/elasticsearch/issues/120088
237235
- class: org.elasticsearch.xpack.security.QueryableReservedRolesIT
238236
method: testConfiguredReservedRolesAfterClosingAndOpeningIndex
239237
issue: https://github.com/elastic/elasticsearch/issues/120127

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

Lines changed: 6 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -83,9 +83,12 @@ public void cleanup() {
8383
updateClusterSettings(Settings.builder().putNull("logger.org.elasticsearch.xpack.ml.datafeed"));
8484
cleanUp();
8585
// 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());
86+
// sometimes result in lingering persistent close tasks, which cause
87+
// subsequent tests to fail. Therefore, they're explicitly cancelled.
88+
CancelTasksRequest cancelTasksRequest = new CancelTasksRequest();
89+
cancelTasksRequest.setActions("*close*");
90+
cancelTasksRequest.setWaitForCompletion(true);
91+
client().execute(TransportCancelTasksAction.TYPE, cancelTasksRequest).actionGet();
8992
}
9093

9194
public void testLookbackOnly() throws Exception {

0 commit comments

Comments
 (0)