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

backport-2.0: sql: fill in required privileges at Validate time. #24393

Merged
merged 1 commit into from Apr 1, 2018

Conversation

mberhault
Copy link
Contributor

Backport 1/1 commits from #24390.

/cc @cockroachdb/release


Fixes #24382

We now call MaybeFixPrivileges directly in Validate to avoid any cases
of missed descriptors (occurring in mixed-versions settings).
This can be removed once 2.1 has a repeated migration to fix privileges,
in which case mixed-version will be 2.0 and generate good descriptors
anyway.

We may even want to wait until 2.2 if we want guarantees that noone can
fail validation while migrations are running.

This needs to be cherry-picked into 2.0 as this affects rolling
upgrades.

Release note: sql change: always fill in minimum required privileges.

Fixes cockroachdb#24382

We now call MaybeFixPrivileges directly in Validate to avoid any cases
of missed descriptors (occurring in mixed-versions settings).
This can be removed once 2.1 has a repeated migration to fix privileges,
in which case mixed-version will be 2.0 and generate good descriptors
anyway.

We may even want to wait until 2.2 if we want guarantees that noone can
fail validation while migrations are running.

This needs to be cherry-picked into 2.0 as this affects rolling
upgrades.

Release note: sql change: always fill in minimum required privileges.
@mberhault mberhault requested review from a team April 1, 2018 02:58
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@mberhault
Copy link
Contributor Author

@bdarnell: this one definitely needs to be a 2.0 cherry-pick, sorry.

Copy link
Contributor

@benesch benesch left a comment

Choose a reason for hiding this comment

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

Code LGTM but Ben should weigh in before this lands!

@bdarnell
Copy link
Member

bdarnell commented Apr 1, 2018

:lgtm:

Let's start testing the new build today so this change can be included in rc1 tomorrow.


Review status: 0 of 4 files reviewed at latest revision, all discussions resolved, all commit checks successful.


Comments from Reviewable

@mberhault mberhault merged commit 1421bd1 into cockroachdb:release-2.0 Apr 1, 2018
@mberhault mberhault deleted the backport2.0-24390 branch April 1, 2018 15:12
@mberhault
Copy link
Contributor Author

Thanks for the review. Who is in charge of it?

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

4 participants