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 v8.19.3 auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) labels Aug 14, 2025
@albertzaharovits
Copy link
Contributor Author

@elasticmachine test this please

rjernst and others added 2 commits August 14, 2025 16:17
…elastic#132882) (elastic#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.
@albertzaharovits albertzaharovits force-pushed the backport-819-fix-131789 branch from 0814c1b to 7dcceb8 Compare August 14, 2025 14:34
@elasticsearchmachine elasticsearchmachine merged commit c90a4f6 into elastic:8.19 Aug 15, 2025
22 checks passed
@albertzaharovits albertzaharovits deleted the backport-819-fix-131789 branch August 15, 2025 04:42
szybia added a commit to szybia/elasticsearch that referenced this pull request Aug 15, 2025
* upstream/8.19:
  [8.19] Fix MergeWithLowDiskSpaceIT testRelocationWhileForceMerging (elastic#132913)
  Allow the test to also accept partial, this seems to be normal (elastic#132614) (elastic#132949)
  Add `complete` attribute to .fleet-agents docs (elastic#127651) (elastic#132903)
  [8.19] docs: add 429 semantic_text troubleshooting (elastic#132747)
  Reduce logging levels for meter usage tests (elastic#131935) (elastic#131942)
  Add 8.19.2 Connectors release notes (elastic#132714)
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 v8.19.3

Projects

None yet

Development

Successfully merging this pull request may close these issues.

3 participants