Skip to content

Conversation

rjernst
Copy link
Member

@rjernst rjernst commented Sep 17, 2025

Backports the following commits to 9.1:

This commit adds a few more validations:
* we cannot jump the primary id more than the normal increment
* we cannot remove an existing id

Also fixed definition path output in some validation error messages.
@rjernst rjernst requested a review from a team as a code owner September 17, 2025 19:25
@rjernst rjernst added :Core/Infra/Core Core issues without another label >non-issue auto-merge-without-approval Automatically merge pull request when CI checks pass (NB doesn't wait for reviews!) backport Team:Core/Infra Meta label for core/infra team labels Sep 17, 2025
Primary ids are only incremented on the main branch. For release branches
only patch ids will be created. The primary id validation won't always
work on release branches because only some of the primary ids will be
backported.

This commit skips primary id validation if we are sure we are on a
release branch. We can tell this by looking at the current upper bound
compared to other upper bounds. If there is a newer one, we know we are
on a release branch. If there isn't a newer one, we _might_ be on a
release branch, or on main, but in this case doing primary id validation
is ok because there's effectively no difference, we are looking at the
latest upper bound.
@elasticsearchmachine elasticsearchmachine merged commit 32b90cf into elastic:9.1 Sep 23, 2025
36 checks passed
@rjernst rjernst deleted the backport/9.1/pr-134597 branch September 23, 2025 00:25
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 :Core/Infra/Core Core issues without another label >non-issue Team:Core/Infra Meta label for core/infra team v9.1.5

Projects

None yet

Development

Successfully merging this pull request may close these issues.

2 participants