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-23.2: storage: assert local single delete safety #114878

Merged
merged 2 commits into from
Nov 22, 2023

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Nov 22, 2023

Backport 2/2 commits from #114820 on behalf of @jbowens.

/cc @cockroachdb/release


During intent resolution, examine internal keys when intending to delete an
intent using a single delete tombstone to validate that it is indeed safe
within the local Engine. This is a safety measure to validate that we do not
violate the invariants that make singe deletion deterministic and cause replica
divergence. False negatives are possible, since this safety mechanism only
examines the local engine state and only the state visible to the open lock
table iterator at the time of proposal evaluation.

Release note: none
Epic: none
Informs #114492.
Informs #114421.


Release justification: Adds assertions that protect and identify corruption.

@blathers-crl blathers-crl bot requested review from a team as code owners November 22, 2023 05:41
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-114820 branch from ac10970 to ad2dd02 Compare November 22, 2023 05:41
@blathers-crl blathers-crl bot requested a review from itsbilal November 22, 2023 05:41
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-114820 branch from ad2dd02 to e9acfd0 Compare November 22, 2023 05:41
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Nov 22, 2023
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.2-114820 branch from 28a4f4d to ce3620d Compare November 22, 2023 05:41
Copy link
Author

blathers-crl bot commented Nov 22, 2023

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 and one additional
    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 Nov 22, 2023
Copy link
Author

blathers-crl bot commented Nov 22, 2023

It looks like your PR touches production code but doesn't add or edit any test code. Did you consider adding tests to your PR?

🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.

@cockroach-teamcity
Copy link
Member

This change is Reviewable

…rnal

This is a simple refactor of the mvccResolveWriteIntent and
mvccReleaseLockInternal helpers to return an enum, rather than a bool,
describing the outcome. This is preparation for a subsequent commit that will
introduce an assertion whenever a SingleDelete tombstone is used to clear an
intent.

Epic: none
Release note: none
During intent resolution, examine internal keys when intending to delete an
intent using a single delete tombstone to validate that it is indeed safe
within the local Engine. This is a safety measure to validate that we do not
violate the invariants that make singe deletion deterministic causing replica
divergence. False negatives are possible, since this safety mechanism only
examines the local engine state and only the state visible to the open lock
table iterator at the time of proposal evaluation.

Release note: none
Epic: none
Informs #114492.
Informs #114421.
@jbowens jbowens force-pushed the blathers/backport-release-23.2-114820 branch from ce3620d to 0f14f44 Compare November 22, 2023 14:06
Copy link
Member

@itsbilal itsbilal left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@nicktrav
Copy link
Collaborator

EM LGTM ✅

@jbowens jbowens merged commit c5763e7 into release-23.2 Nov 22, 2023
5 of 6 checks passed
@jbowens jbowens deleted the blathers/backport-release-23.2-114820 branch November 22, 2023 15:51
Copy link
Member

@nvanbenschoten nvanbenschoten left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

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.

5 participants