Skip to content

Conversation

albertzaharovits
Copy link
Contributor

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
Backport of #132496

Co-authored-by: Patrick Doyle [email protected]

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 <[email protected]>
@albertzaharovits albertzaharovits self-assigned this Aug 14, 2025
@albertzaharovits albertzaharovits added >test Issues or PRs that are addressing/adding tests :Distributed Indexing/Distributed A catch all label for anything in the Distributed Indexing Area. Please avoid if you can. backport v9.1.3 labels Aug 14, 2025
@albertzaharovits albertzaharovits changed the title There must be at least one merge task blocked (#132496) [9.1] Fix MergeWithLowDiskSpaceIT testRelocationWhileForceMerging (#132496) Aug 14, 2025
@albertzaharovits albertzaharovits added the auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) label Aug 14, 2025
@elasticsearchmachine elasticsearchmachine merged commit 31f447e into elastic:9.1 Aug 14, 2025
34 checks passed
@albertzaharovits albertzaharovits deleted the backport-91-fix-131789 branch August 14, 2025 09:02
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/Distributed A catch all label for anything in the Distributed Indexing Area. Please avoid if you can. >test Issues or PRs that are addressing/adding tests v9.1.3

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants