Skip to content

[8.19] Fix ThreadPoolMergeSchedulerTests testSchedulerCloseWaitsForRunningMerge #130565

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.

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

Conversation

albertzaharovits
Copy link
Contributor

This fixes a race condition in the test scenario, between the merge scheduler closing and the merge task being scheduled to run. The test scenario expects that the merge task runs when the scheduler is closed. If the merge scheduler is closed before the merge task is scheduled, the merge task will instead be scheduled as aborted.

Fixes: #125236
Backport of #130078

…rge (elastic#130078)

This fixes a race condition in the test scenario, between the merge
scheduler closing and the merge task being scheduled to run. The test
scenario expects that the merge task runs when the scheduler is closed.
If the merge scheduler is closed before the merge task is scheduled, the
merge task will instead be scheduled as aborted.

Fixes: elastic#125236
@albertzaharovits albertzaharovits self-assigned this Jul 3, 2025
@albertzaharovits albertzaharovits added >test Issues or PRs that are addressing/adding tests :Distributed Indexing/Engine Anything around managing Lucene and the Translog in an open shard. backport auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) v8.19.1 labels Jul 3, 2025
@elasticsearchmachine elasticsearchmachine merged commit 844a289 into elastic:8.19 Jul 4, 2025
22 checks passed
@albertzaharovits albertzaharovits deleted the backport-819-fix-125236 branch July 4, 2025 07:30
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport :Distributed Indexing/Engine Anything around managing Lucene and the Translog in an open shard. >test Issues or PRs that are addressing/adding tests v8.19.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

2 participants