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

clusterversion: Move JoinTokensTable,AcquisitionTypeInLeaseHistory to 21.2 #64413

Merged
merged 1 commit into from
May 1, 2021

Conversation

itsbilal
Copy link
Member

First commit is #64391.

This change moves the cluster versions JoinTokensTable and
AcquisitionTypeInLeaseHistory to sort after 21.1, as neither
of these changes will be backported to 21.1. The JoinTokensTable
migration is idempotent so it's okay if it runs twice on a
small set of nodes.

Release note: None.

@itsbilal itsbilal requested review from dt, knz and j-low April 29, 2021 19:27
@itsbilal itsbilal self-assigned this Apr 29, 2021
@cockroach-teamcity
Copy link
Member

This change is Reviewable

@itsbilal
Copy link
Member Author

TFTRs! Had to also reorder the version keys as one of the tests was checking for them being in order.

@dt
Copy link
Member

dt commented Apr 30, 2021

let's merge #64391 first though?

@itsbilal
Copy link
Member Author

#64391 is merged, rebased on top of master.

… 21.2

This change moves the cluster versions JoinTokensTable and
AcquisitionTypeInLeaseHistory to sort after 21.1, as neither
of these changes will be backported to 21.1. The JoinTokensTable
migration is idempotent so it's okay if it runs twice on a
small set of nodes.

Release note: None.
@itsbilal
Copy link
Member Author

Looks like some stuff in the version-upgrade acceptance test needs updating. Will take a look on Monday.

@itsbilal
Copy link
Member Author

itsbilal commented May 1, 2021

Nevermind, that test got skipped as it's a master issue.

bors r=dt

@craig
Copy link
Contributor

craig bot commented May 1, 2021

Build succeeded:

@craig craig bot merged commit 684e753 into cockroachdb:master May 1, 2021
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.

4 participants