Skip to content

Stabilize CancellableTasksIT#testRemoveBanParentsOnDisconnect #131858

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 3 commits into from
Aug 5, 2025
Merged

Stabilize CancellableTasksIT#testRemoveBanParentsOnDisconnect #131858

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
d6e1883
Stabilize CancellableTasksIT#testRemoveBanParentsOnDisconnect
DiannaHohensee Jul 24, 2025
2ef7c01
Merge branch 'main' into 2025/07/23/test-fix-131562
DiannaHohensee Aug 1, 2025
b28fd42
fix merge
DiannaHohensee Aug 1, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 0 additions & 3 deletions muted-tests.yml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -458,9 +458,6 @@ tests:
- class: org.elasticsearch.xpack.search.CrossClusterAsyncSearchIT
method: testCancellationViaTimeoutWithAllowPartialResultsSetToFalse
issue: https://github.com/elastic/elasticsearch/issues/131248
- class: org.elasticsearch.action.admin.cluster.node.tasks.CancellableTasksIT
method: testRemoveBanParentsOnDisconnect
issue: https://github.com/elastic/elasticsearch/issues/131562
- class: org.elasticsearch.xpack.esql.action.CrossClusterQueryWithPartialResultsIT
method: testPartialResults
issue: https://github.com/elastic/elasticsearch/issues/131481
Expand Down
4 changes: 4 additions & 0 deletions ...lusterTest/java/org/elasticsearch/action/admin/cluster/node/tasks/CancellableTasksIT.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -363,6 +363,10 @@ public void testRemoveBanParentsOnDisconnect() throws Exception {
allowEntireRequest(rootRequest);
cancelFuture.actionGet();
ensureBansAndCancellationsConsistency();
// This method will call the cluster health API with wait_for_tasks set to Priority#LANGUID. This will ensure that all tasks
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Did you run this test X times to verify this indeed fixes any race conditions? (Only that since we've unmuted the test, it would be silly if it failed again in two days)

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Thanks for checking. I realize that the context isn't all there in the git issue: some of the discussion occurred in slack.

I just went ahead and ran it successfully locally on my machine a dozen or so times. It's hard to confirm, since failures usually occur under stressed concurrency conditions.

// currently submitted to the master service (included re-election after a disconnect) are processed before returning. This
// ensures cluster stability for the post-test consistency checks.
ensureStableCluster(nodes.size());
}
}

Expand Down