Fix MergeWithLowDiskSpaceIT testRelocationWhileForceMerging#132496
Merged
elasticsearchmachine merged 3 commits intoelastic:mainfrom Aug 13, 2025
Merged
Fix MergeWithLowDiskSpaceIT testRelocationWhileForceMerging#132496elasticsearchmachine merged 3 commits intoelastic:mainfrom
elasticsearchmachine merged 3 commits intoelastic:mainfrom
Conversation
Collaborator
|
Pinging @elastic/es-distributed-indexing (Team:Distributed Indexing) |
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
Aug 14, 2025
After triggering a force merge, there might still be other merge tasks running concurrently, so it is incorrect to assert a single merge is blocked in the test. Fix elastic#131789 Co-authored-by: Patrick Doyle <patrick.doyle@elastic.co>
albertzaharovits
added a commit
to albertzaharovits/elasticsearch
that referenced
this pull request
Aug 14, 2025
After triggering a force merge, there might still be other merge tasks running concurrently, so it is incorrect to assert a single merge is blocked in the test. Fix elastic#131789 Co-authored-by: Patrick Doyle <patrick.doyle@elastic.co>
This was referenced Aug 14, 2025
elasticsearchmachine
pushed a commit
that referenced
this pull request
Aug 14, 2025
After triggering a force merge, there might still be other merge tasks running concurrently, so it is incorrect to assert a single merge is blocked in the test. Fix #131789 Co-authored-by: Patrick Doyle <patrick.doyle@elastic.co>
albertzaharovits
added a commit
to albertzaharovits/elasticsearch
that referenced
this pull request
Aug 14, 2025
After triggering a force merge, there might still be other merge tasks running concurrently, so it is incorrect to assert a single merge is blocked in the test. Fix elastic#131789 Co-authored-by: Patrick Doyle <patrick.doyle@elastic.co>
elasticsearchmachine
pushed a commit
that referenced
this pull request
Aug 14, 2025
After triggering a force merge, there might still be other merge tasks running concurrently, so it is incorrect to assert a single merge is blocked in the test. Fix #131789 Co-authored-by: Patrick Doyle <patrick.doyle@elastic.co>
elasticsearchmachine
pushed a commit
that referenced
this pull request
Aug 15, 2025
…132913) * There must be at least one merge task blocked (#132496) After triggering a force merge, there might still be other merge tasks running concurrently, so it is incorrect to assert a single merge is blocked in the test. Fix #131789 Co-authored-by: Patrick Doyle <patrick.doyle@elastic.co> * Use consistent terminology for transport version resources/references (#132882) (#132898) The build system for transport versions operate on two different types of projects. A project can have named references to transport versions, and it could also be the source of truth for transport version resources, where latest and definitions files exist. This commit renames the plugins and tasks to consistently use that terminology. --------- Co-authored-by: Patrick Doyle <patrick.doyle@elastic.co> Co-authored-by: Ryan Ernst <ryan@iernst.net>
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.
After triggering a force merge, there might still be other merge tasks running concurrently, so it is incorrect to assert a single merge is blocked in the test.
Fix #131789
Co-authored-by: Patrick Doyle patrick.doyle@elastic.co