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

sql,backupccl: add more tests for user ID migrations #99533

Merged
merged 3 commits into from
Mar 30, 2023

Conversation

andyyang890
Copy link
Collaborator

@andyyang890 andyyang890 commented Mar 24, 2023

sql: add mixed version test for system.privileges user ID migration

This patch adds a mixed version logic test that ensures granting of
system privileges continues to work properly in a cluster that has
both 22.2 and 23.1 nodes. The relevant version gate being tested here
is V23_1SystemPrivilegesTableHasUserIDColumn.

Release note: None


sql: add mixed version test for system.database_role_settings user IDs

This patch adds a mixed version logic test that ensures setting default
session variables continues to work properly in a cluster that has
both 22.2 and 23.1 nodes. The relevant version gate being tested here
is V23_1DatabaseRoleSettingsHasRoleIDColumn.

Release note: None


backupccl: update TestRestoreOldVersions subtest for system.privileges

This patch updates the TestRestoreOldVersions subtest for the
system.privileges table to also test that a row for the public
role is correctly restored.

Release note: None


Part of #87079
Part of #92342

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@andyyang890 andyyang890 added the backport-23.1.x Flags PRs that need to be backported to 23.1 label Mar 24, 2023
This patch adds a mixed version logic test that ensures granting of
system privileges continues to work properly in a cluster that has
both 22.2 and 23.1 nodes. The relevant version gate being tested here
is V23_1SystemPrivilegesTableHasUserIDColumn.

Release note: None
This patch adds a mixed version logic test that ensures setting default
session variables continues to work properly in a cluster that has
both 22.2 and 23.1 nodes. The relevant version gate being tested here
is V23_1DatabaseRoleSettingsHasRoleIDColumn.

Release note: None
This patch updates the TestRestoreOldVersions subtest for the
system.privileges table to also test that a row for the public
role is correctly restored.

Release note: None
@andyyang890 andyyang890 marked this pull request as ready for review March 25, 2023 02:38
@andyyang890 andyyang890 requested a review from a team as a code owner March 25, 2023 02:38
@andyyang890 andyyang890 requested review from rhu713, rafiss and a team and removed request for a team March 25, 2023 02:38
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!

@andyyang890
Copy link
Collaborator Author

TFTR!

bors r=rafiss

@craig
Copy link
Contributor

craig bot commented Mar 28, 2023

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Mar 28, 2023

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Mar 29, 2023

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Mar 29, 2023

Build failed (retrying...):

@craig
Copy link
Contributor

craig bot commented Mar 29, 2023

Build failed:

@andyyang890
Copy link
Collaborator Author

bors r=rafiss

@andyyang890
Copy link
Collaborator Author

bors ping

@craig
Copy link
Contributor

craig bot commented Mar 30, 2023

pong

@andyyang890
Copy link
Collaborator Author

seems like bors is stuck

bors r-

@craig
Copy link
Contributor

craig bot commented Mar 30, 2023

Canceled.

@andyyang890
Copy link
Collaborator Author

bors r=rafiss

@craig
Copy link
Contributor

craig bot commented Mar 30, 2023

Build succeeded:

@craig craig bot merged commit 96e8593 into cockroachdb:master Mar 30, 2023
@blathers-crl
Copy link

blathers-crl bot commented Mar 30, 2023

Encountered an error creating backports. Some common things that can go wrong:

  1. The backport branch might have already existed.
  2. There was a merge conflict.
  3. The backport branch contained merge commits.

You might need to create your backport manually using the backport tool.


error creating merge commit from 7bf12b6 to blathers/backport-release-23.1-99533: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict []

you may need to manually resolve merge conflicts with the backport tool.

Backport to branch 23.1.x failed. See errors above.


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

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
backport-23.1.x Flags PRs that need to be backported to 23.1
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants