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-24.3: workload/schemachanger: fix drop columns during PK swaps #136810

Merged
merged 1 commit into from
Dec 5, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Dec 5, 2024

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

/cc @cockroachdb/release


Previously, if a declarative alter primary key and drop column were executed concurrently this workload did not correctly pick the correct columns. It was possible for the new primary key column to be selected for the drop operation. To address this, this patch allows potential execution errors for invalid column references when a PK swap is in progress.

Fixes: #134056
Fixes: #136661
Fixes: #136405
Fixes: #132298

Release note: None


Release justification: test only change to deflake

@blathers-crl blathers-crl bot requested a review from a team as a code owner December 5, 2024 15:32
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-24.3-136738 branch from 0fd23d7 to fee2011 Compare December 5, 2024 15:32
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Dec 5, 2024
@blathers-crl blathers-crl bot requested review from sambhav-jain-16 and csgourav and removed request for a team December 5, 2024 15:32
Copy link
Author

blathers-crl bot commented Dec 5, 2024

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 Dec 5, 2024
@cockroach-teamcity
Copy link
Member

This change is Reviewable

Previously, if a declarative alter primary key and drop column were
executed concurrently this workload did not correctly pick the correct
columns. It was possible for the new primary key column to be selected
for the drop operation. To address this, this patch allows potential
execution errors for invalid column references when a PK swap is in
progress.

Fixes: #134056
Fixes: #136661
Fixes: #136405
Fixes: #132298

Release note: None
@fqazi fqazi force-pushed the blathers/backport-release-24.3-136738 branch from fee2011 to 6e19976 Compare December 5, 2024 18:46
@fqazi
Copy link
Collaborator

fqazi commented Dec 5, 2024

Also picked up: #136833

@fqazi fqazi merged commit d68d1b3 into release-24.3 Dec 5, 2024
20 of 21 checks passed
@fqazi fqazi deleted the blathers/backport-release-24.3-136738 branch December 5, 2024 21:41
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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants