Skip to content
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

release-25.1: sql: concurrent DML can prevent PK swaps from succeeding #141383

Merged
merged 1 commit into from
Feb 19, 2025

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Feb 12, 2025

Backport 1/1 commits from #141189 on behalf of @fqazi.

/cc @cockroachdb/release

fixes #141528


Previously, we added an optimization to skip re-resolving object metadata if no leased descriptors had changed. This change also leased descriptors to ensure schema changes couldn't progress, as otherwise we could corrupt data by writing incompatible information. While this resolved most failures associated with concurrent DML/DDL execution by leasing required descriptors, intermittent failures still occur if a primary key change happens. This is because we can end up using an old descriptor version, which results in DML not writing information into the temporary indexes. While there's no risk of generating a corrupt index because validation catches the missing rows, this bug can cause these schema changes to fail. To address this, this patch adds logic to ensure descriptor versions match; otherwise, the memo will be re-planned.

Fixes: #140475
Fixes: #140954
Release note (bug fix): Addresses a bug that could cause concurrent DML to prevent primary key changes from succeeding


Release justification: low risk fix to address intermittent failures that can cause schema changes to fail

@blathers-crl blathers-crl bot requested review from a team as code owners February 12, 2025 17:50
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-25.1-141189 branch from 72eb3f3 to 91d29fa Compare February 12, 2025 17:50
@blathers-crl blathers-crl bot requested review from mgartner and removed request for a team February 12, 2025 17:50
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Feb 12, 2025
@blathers-crl blathers-crl bot requested review from fqazi, rafiss and rytaft February 12, 2025 17:50
Copy link
Author

blathers-crl bot commented Feb 12, 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 Feb 12, 2025
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Previously, we added an optimization to skip re-resolving object
metadata if no leased descriptors had changed. This change also leased
descriptors to ensure schema changes couldn't progress, as otherwise we
could corrupt data by writing incompatible information. While this
resolved most failures associated with concurrent DML/DDL execution by
leasing required descriptors, intermittent failures still occur if a
primary key change happens.  This is because we can end up using an old
descriptor version, which results in DML not writing information into
the temporary indexes. While there's no risk of generating a corrupt
index because validation catches the missing rows, this bug can cause
these schema changes to fail. To address this, this patch adds logic to
ensure descriptor versions match; otherwise, the memo will be
re-planned.

Fixes: #140475
Release note (bug fix): Addresses a bug that could cause concurrent DML
to prevent primary key changes from succeeding
@fqazi fqazi force-pushed the blathers/backport-release-25.1-141189 branch from 91d29fa to a63d74e Compare February 12, 2025 21:28
@fqazi fqazi merged commit 1701338 into release-25.1 Feb 19, 2025
15 of 16 checks passed
@fqazi fqazi deleted the blathers/backport-release-25.1-141189 branch February 19, 2025 15:29
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 blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. target-release-25.1.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants