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

upgrades: fix idempotence issue in system table role id migrations #91756

Merged
merged 1 commit into from
Nov 16, 2022

Conversation

andyyang890
Copy link
Collaborator

@andyyang890 andyyang890 commented Nov 11, 2022

This patch fixes an idempotence issue in the role id migrations for
the system.users and system.role_options tables.

Fixes #91449

Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@andyyang890
Copy link
Collaborator Author

Depends on #91755

@andyyang890 andyyang890 force-pushed the roleid_mig_fix branch 2 times, most recently from 1f8c95f to 389303f Compare November 14, 2022 18:46
@andyyang890 andyyang890 marked this pull request as ready for review November 14, 2022 19:35
@andyyang890 andyyang890 requested review from a team and rafiss November 14, 2022 19:35
Copy link
Contributor

@ajwerner ajwerner left a comment

Choose a reason for hiding this comment

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

:lgtm:

Reviewed 2 of 2 files at r4, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @rafiss)

@ajwerner
Copy link
Contributor

make sure to backport this to 22.2

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.

Reviewed 3 of 5 files at r3, 2 of 2 files at r4, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @andyyang890)

This patch fixes an idempotence issue in the role id migrations for
the system.users and system.role_options tables.

Release note: None
@andyyang890
Copy link
Collaborator Author

bors r=ajwerner,rafiss

craig bot pushed a commit that referenced this pull request Nov 16, 2022
91756: upgrades: fix idempotence issue in system table role id migrations r=ajwerner,rafiss a=andyyang890

This patch fixes an idempotence issue in the role id migrations for
the system.users and system.role_options tables.

Fixes #91449

Release note: None

Co-authored-by: Andy Yang <[email protected]>
@craig
Copy link
Contributor

craig bot commented Nov 16, 2022

Build failed:

@andyyang890
Copy link
Collaborator Author

test flakes

bors r=ajwerner,rafiss

@craig
Copy link
Contributor

craig bot commented Nov 16, 2022

Build succeeded:

@craig craig bot merged commit 6594b56 into cockroachdb:master Nov 16, 2022
@blathers-crl
Copy link

blathers-crl bot commented Nov 16, 2022

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 b8ca64f to blathers/backport-release-22.2-91756: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 403 Resource not accessible by integration []

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

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


🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan.

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.

sql: rerunning an intermediate system table user ID migration will fail
4 participants