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.1: sql: use high priority for populating RoleMemberCache #117712

Merged
merged 1 commit into from Jan 16, 2024

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Jan 12, 2024

Backport 1/1 commits from #117258 on behalf of @Xiang-Gu.

/cc @cockroachdb/release


Previously, when the RoleMemberCache is invalid, it launches a new txn in a singleflight to read from system.role_members table to populate the cache. If, however, the original txn has previously laid a write intent on the same system table, then we end up having a deadlock: original txn waits for this new txn; this new txn waits for original txn.

Fixes #117144
Release note (bug fix): Fixed a bug where concurrent GRANTs can cause deadlocks.


Release justification: important bug fixes

@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-23.1-117258 branch from 3618883 to 1615096 Compare January 12, 2024 00:00
@blathers-crl blathers-crl bot added blathers-backport This is a backport that Blathers created automatically. O-robot Originated from a bot. labels Jan 12, 2024
Copy link
Author

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

This change is Reviewable

Previously, when the RoleMemberCache is invalid, it launches a new txn
in a singleflight to read from `system.role_members` table to populate
the cache. If, however, the original txn has previously laid a write
intent on the same system table, then we end up having a deadlock:
original txn waits for this new txn; this new txn waits for original txn
This commit therefore make the singleflight txn high priority so that
it won't be blocked by the original txn.

However, if the original txn is already high priority, the deadlock
becomes possible again. Fortunately, in this case, txn in retry is a
prerequisite for the deadlock to occur (see
#117258 (comment))
so our solution to it is to not use singleflight to populate
RoleMemberCache if txn is high priority and in retry but instead
directly use txn itself to read and return the result.

Release note (bug fix): Fixed a bug where concurrent GRANTs can cause
deadlocks.
@Xiang-Gu Xiang-Gu force-pushed the blathers/backport-release-23.1-117258 branch from 1615096 to a947138 Compare January 16, 2024 15:03
@Xiang-Gu Xiang-Gu merged commit aab357f into release-23.1 Jan 16, 2024
5 of 6 checks passed
@Xiang-Gu Xiang-Gu deleted the blathers/backport-release-23.1-117258 branch January 16, 2024 16:34
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.

None yet

3 participants