Skip to content

release-25.2: restore: fix split race in split and scatter processor #147183

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 1 commit into from
May 23, 2025

Conversation

msbutler
Copy link
Collaborator

Backport 1/3 commits from #147104.

/cc @cockroachdb/release


Informs #146083

Release note: none

@msbutler msbutler requested a review from stevendanna May 22, 2025 22:00
@msbutler msbutler self-assigned this May 22, 2025
@msbutler msbutler requested a review from a team as a code owner May 22, 2025 22:00
@msbutler msbutler requested review from kev-cao and removed request for a team May 22, 2025 22:00
Copy link

blathers-crl bot commented May 22, 2025

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Backports should only be created for serious
    issues
    or test-only changes.
  • Backports should not break backwards-compatibility.
  • Backports should change as little code as possible.
  • Backports should not change on-disk formats or node communication protocols.
  • Backports should not add new functionality (except as defined
    here).
  • Backports must not add, edit, or otherwise modify cluster versions; or add version gates.
  • All backports must be reviewed by the owning areas TL. For more information as to how that review should be conducted, please consult the backport
    policy
    .
If your backport adds new functionality, please ensure that the following additional criteria are satisfied:
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters. State changes must be further protected such that nodes running old binaries will not be negatively impacted by the new state (with a mixed version test added).
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.
  • Your backport must be accompanied by a post to the appropriate Slack
    channel (#db-backports-point-releases or #db-backports-XX-X-release) for awareness and discussion.

Also, please add a brief release justification to the body of your PR to justify this
backport.

@blathers-crl blathers-crl bot added the backport Label PR's that are backports to older release branches label May 22, 2025
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@msbutler msbutler merged commit ed23aca into cockroachdb:release-25.2 May 23, 2025
14 of 15 checks passed
@msbutler msbutler deleted the backport25.2-147104 branch May 23, 2025 13:32
@msbutler
Copy link
Collaborator Author

blathers backport release-25.2.1-rc

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport Label PR's that are backports to older release branches target-release-25.2.2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants