Add TEST MergeWithLowDiskSpaceIT testForceMergeIsBlockedThenUnblocked#130189
Merged
elasticsearchmachine merged 4 commits intoelastic:mainfrom Jun 29, 2025
Conversation
Collaborator
|
Pinging @elastic/es-distributed-indexing (Team:Distributed Indexing) |
henningandersen
approved these changes
Jun 27, 2025
Contributor
henningandersen
left a comment
There was a problem hiding this comment.
LGTM
I hope we can avoid the thread though.
| ); | ||
| } | ||
| // start force merging (which is blocking) on a separate thread | ||
| Thread forceMergeThread = new Thread( |
Contributor
There was a problem hiding this comment.
Could we avoid the .get() call and use execute() instead to avoid the thread? Assertions further down could then be about whether the future is done or not.
Contributor
Author
There was a problem hiding this comment.
Of course, thanks for the suggestion! (I've handled it as part of 3452dce)
| long totalMergeCount = indicesStatsResponse.getIndices().get(indexName).getPrimaries().merge.getTotal(); | ||
| assertThat(totalMergeCount, greaterThan(0L)); | ||
| // force merge call returned | ||
| assertFalse(forceMergeThread.isAlive()); |
Contributor
There was a problem hiding this comment.
Could we instead wait for the force merge to complete first? If we go for a future, we can use future.get() here (or safeGet). If not, we can use forcemergeThread.join. That way I think we can avoid the assertBusy, since all the things here should hopefully be up to date.
Contributor
Author
There was a problem hiding this comment.
Great suggestion too, thanks! (also handled as part of 3452dce)
albertzaharovits
added a commit
to albertzaharovits/elasticsearch
that referenced
this pull request
Jun 29, 2025
…elastic#130189) This adds a new IT for when forced merges are blocked (and then unblocked) because of the insufficient disk space situation. This test was suggested elastic#127613 (review).
albertzaharovits
added a commit
to albertzaharovits/elasticsearch
that referenced
this pull request
Jun 29, 2025
…elastic#130189) This adds a new IT for when forced merges are blocked (and then unblocked) because of the insufficient disk space situation. This test was suggested elastic#127613 (review).
This was referenced Jun 29, 2025
Merged
Collaborator
elasticsearchmachine
pushed a commit
that referenced
this pull request
Jun 29, 2025
…#130189) (#130288) This adds a new IT for when forced merges are blocked (and then unblocked) because of the insufficient disk space situation. This test was suggested #127613 (review).
albertzaharovits
added a commit
to albertzaharovits/elasticsearch
that referenced
this pull request
Jun 30, 2025
…elastic#130189) This adds a new IT for when forced merges are blocked (and then unblocked) because of the insufficient disk space situation. This test was suggested elastic#127613 (review).
elasticsearchmachine
pushed a commit
that referenced
this pull request
Jun 30, 2025
…blocked (#130189) (#130289) * Add TEST MergeWithLowDiskSpaceIT testForceMergeIsBlockedThenUnblocked (#130189) This adds a new IT for when forced merges are blocked (and then unblocked) because of the insufficient disk space situation. This test was suggested #127613 (review). * Add TEST MergeWithLowDiskSpaceIT testForceMergeIsBlockedThenUnblocked (#130189) This adds a new IT for when forced merges are blocked (and then unblocked) because of the insufficient disk space situation. This test was suggested #127613 (review). * Telemetry metrics don't exist in 8.19
elasticsearchmachine
pushed a commit
that referenced
this pull request
Jun 30, 2025
…locked (#130189) (#130287) * Add TEST MergeWithLowDiskSpaceIT testForceMergeIsBlockedThenUnblocked (#130189) This adds a new IT for when forced merges are blocked (and then unblocked) because of the insufficient disk space situation. This test was suggested #127613 (review). * merge telemetry metrics don't exist in 9.0 * Fix MergeWithLowDiskSpaceIT post telemetry plugin removal * [CI] Auto commit changes from spotless --------- Co-authored-by: elasticsearchmachine <infra-root+elasticsearchmachine@elastic.co>
mridula-s109
pushed a commit
to mridula-s109/elasticsearch
that referenced
this pull request
Jul 3, 2025
…elastic#130189) This adds a new IT for when forced merges are blocked (and then unblocked) because of the insufficient disk space situation. This test was suggested elastic#127613 (review).
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
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 adds a new IT for when forced merges are blocked (and then unblocked) because of the insufficient disk space situation.
This test was suggested #127613 (review).