Fix ThreadPoolMergeSchedulerTests testSchedulerCloseWaitsForRunningMerge #126110
Conversation
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
albertzaharovits
added
>test
elasticsearchmachine
added
the
Team:Distributed Indexing
Collaborator
|
Pinging @elastic/es-distributed-indexing (Team:Distributed Indexing) |
henningandersen
approved these changes
Apr 2, 2025
Contributor
henningandersen
left a comment
henningandersen
left a comment
There was a problem hiding this comment.
LGTM.
I'd be ok with this fix, but proposed an alternative to consider.
| // when the merge scheduler is closed it won't pull in any new merges from the merge source | ||
| verifyNoInteractions(mergeSource2); | ||
| // assert the merge still shows up as "running" | ||
| assertThat(threadPoolMergeScheduler.getRunningMergeTasks().keySet(), contains(oneMerge)); |
Contributor
There was a problem hiding this comment.
I wonder if we should rather just wait for the merge thread to have picked up the task - before this assert busy block? Using CyclicBarrier for instance. Then I think the original check here can work too - without the waiting for it using assert busy. I think that reads more clearly and is a bit stronger.
andreidan
pushed a commit
to andreidan/elasticsearch
that referenced
this pull request
Apr 9, 2025
albertzaharovits
added a commit
to albertzaharovits/elasticsearch
that referenced
this pull request
Jun 9, 2025
This was referenced Jun 9, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #125236