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: catalog: add descriptor repair to remove missing roles #124665

Merged
merged 1 commit into from
May 30, 2024

Conversation

fqazi
Copy link
Collaborator

@fqazi fqazi commented May 24, 2024

Backport 1/1 commits from #122557.

/cc @cockroachdb/release


Previously, we had a bug that could lead to descriptors having privileages to roles that no longer exist. This could lead to certain commands like SHOW GRANTS breaking. To address this, this patch will add descirptor repair logic to automatically clean up oprhaned privileges.

Fixes: #122552

Release note (bug fix): Add automated clean up / validation for dropped roles inside descriptors.
Release justification: low risk fix that prevents corrupt descriptors from impacting SHOW GRANTS

@fqazi fqazi requested a review from a team as a code owner May 24, 2024 16:36
Copy link

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

This change is Reviewable

@fqazi fqazi requested review from dhartunian and rafiss May 24, 2024 16:40
Copy link
Collaborator

@rafiss rafiss left a comment

Choose a reason for hiding this comment

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

i think this should account for node also. maybe we should backport some of the changes i'm adding in #124772

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @dhartunian and @fqazi)


pkg/sql/crdb_internal.go line 6155 at r1 (raw file):

			}
			doError(catalog.ValidateRolesInDescriptor(descriptor, func(username username.SQLUsername) (bool, error) {
				if username.IsRootUser() ||

does this also need to exclude the node user? otherwise, it will report errors on internal objects that are owned by node. i created #124772


pkg/sql/crdb_internal.go line 6620 at r1 (raw file):

							(SELECT username
							FROM system.users UNION
							SELECT 'public' as username)

what about node?


pkg/sql/sem/builtins/builtins.go line 5426 at r1 (raw file):

							(SELECT username
							FROM system.users UNION
							SELECT 'public' as username)

should node go here too?

Previously, we had a bug that could lead to descriptors having
privileages to roles that no longer exist. This could lead to certain
commands like SHOW GRANTS breaking. To address this, this patch will add
descirptor repair logic to automatically clean up oprhaned privileges.

Fixes: cockroachdb#122552

Release note (bug fix): Add automated clean up / validation for dropped
roles inside descriptors.
@fqazi fqazi force-pushed the backport23.2-122557 branch from 7f2f15b to 14917c0 Compare May 28, 2024 22:16
Copy link
Collaborator Author

@fqazi fqazi left a comment

Choose a reason for hiding this comment

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

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @dhartunian and @rafiss)


pkg/sql/crdb_internal.go line 6155 at r1 (raw file):

Previously, rafiss (Rafi Shamim) wrote…

does this also need to exclude the node user? otherwise, it will report errors on internal objects that are owned by node. i created #124772

Done.


pkg/sql/crdb_internal.go line 6620 at r1 (raw file):

Previously, rafiss (Rafi Shamim) wrote…

what about node?

Done.


pkg/sql/sem/builtins/builtins.go line 5426 at r1 (raw file):

Previously, rafiss (Rafi Shamim) wrote…

should node go here too?

Done.

@fqazi fqazi requested a review from rafiss May 29, 2024 13:45
Copy link
Collaborator

@rafiss rafiss left a comment

Choose a reason for hiding this comment

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

lgtm!

Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @dhartunian)

@fqazi
Copy link
Collaborator Author

fqazi commented May 30, 2024

@rafiss @dhartunian TFTR!

@fqazi fqazi merged commit b0e1814 into cockroachdb:release-23.2 May 30, 2024
5 of 6 checks passed
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
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants