Fix ThreadPoolMergeSchedulerTests testSchedulerCloseWaitsForRunningMerge #130078
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) |
Contributor
henningandersen
left a comment
henningandersen
left a comment
There was a problem hiding this comment.
Looks good, though it looks like this PR contains excess changes?
muted-tests.yml
Outdated
| - class: org.elasticsearch.packaging.test.DockerTests | ||
| method: test081SymlinksAreFollowedWithEnvironmentVariableFiles | ||
| issue: https://github.com/elastic/elasticsearch/issues/128867 | ||
| - class: org.elasticsearch.index.engine.ThreadPoolMergeExecutorServiceDiskSpaceTests |
Contributor
There was a problem hiding this comment.
This looks out-of-place for this PR?
| aFileStore.totalSpace = randomLongBetween(1L, 100L); | ||
| bFileStore.usableSpace = randomLongBetween(1L, 100L); | ||
| bFileStore.totalSpace = randomLongBetween(1L, 100L); | ||
| long aUsableSpace; |
Contributor
There was a problem hiding this comment.
This also looks like it belongs somewhere else? Maybe I reviewed this part in another PR already, looks familiar but did not check. Maybe once that is merged, this change disappears?
Contributor
Author
Oh boy, I've mixed up branches, I've got several things in-flight. Will address momentarily. |
This reverts commit 47a3055.
Contributor
Author
|
@henningandersen I've reverted the stray commit on this PR branch. |
albertzaharovits
added
auto-merge-without-approval
Contributor
Author
|
@elasticsearchmachine run elasticsearch-ci/part-3 |
Collaborator
💔 Backport failed
You can use sqren/backport to manually backport by running |
albertzaharovits
added a commit
to albertzaharovits/elasticsearch
that referenced
this pull request
Jun 26, 2025
…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
elasticsearchmachine
pushed a commit
that referenced
this pull request
Jun 29, 2025
…rge (#130078) (#130132) 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
albertzaharovits
added a commit
to albertzaharovits/elasticsearch
that referenced
this pull request
Jul 3, 2025
…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
elasticsearchmachine
pushed a commit
that referenced
this pull request
Jul 3, 2025
…rge (#130078) (#130529) 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
mridula-s109
pushed a commit
to mridula-s109/elasticsearch
that referenced
this pull request
Jul 3, 2025
…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
added a commit
to albertzaharovits/elasticsearch
that referenced
this pull request
Jul 3, 2025
…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
elasticsearchmachine
pushed a commit
that referenced
this pull request
Jul 4, 2025
…rge (#130078) (#130565) 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
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.
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