Skip to content

startupmigrations: remove useless guard in migration#91929

Merged
craig[bot] merged 1 commit intocockroachdb:masterfrom
andreimatei:upgrades.cluster-ver-migration
Nov 16, 2022
Merged

startupmigrations: remove useless guard in migration#91929
craig[bot] merged 1 commit intocockroachdb:masterfrom
andreimatei:upgrades.cluster-ver-migration

Conversation

@andreimatei
Copy link
Copy Markdown
Contributor

@andreimatei andreimatei commented Nov 15, 2022

The migration writing the initial value of the cluster version had a conditional about whether it's performing the migration for the system tenant. The migration only runs as the system tenant, courtesy of the clusterWide setting [1]. This patch this replaces the conditional with an assertion.

[1]

Release note: None
Epic: None

The migration writing the initial value of the cluster version had a
conditional about whether it's performing the migration for the system
tenant. The migration only runs as the system tenant, courtesy of the
clusterWide setting [1]. This patch this replaces the conditional with
an assertion.

[1] https://github.com/cockroachdb/cockroach/blob/fd42d376fb5ec42e9d9a30fcdcb210a8a79ef0e2/pkg/startupmigrations/migrations.go#L108

Release note: None
@andreimatei andreimatei requested review from a team, ajstorm and ajwerner November 15, 2022 18:34
@cockroach-teamcity
Copy link
Copy Markdown
Member

This change is Reviewable

Copy link
Copy Markdown
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 1 of 1 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @ajstorm)

Copy link
Copy Markdown
Collaborator

@ajstorm ajstorm left a comment

Choose a reason for hiding this comment

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

:lgtm: to me too

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

Copy link
Copy Markdown
Contributor Author

@andreimatei andreimatei left a comment

Choose a reason for hiding this comment

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

bors r+

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

@craig
Copy link
Copy Markdown
Contributor

craig bot commented Nov 16, 2022

Build succeeded:

@craig craig bot merged commit 7c7622f into cockroachdb:master Nov 16, 2022
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