Skip to content

upgrade: minor cleanups#91998

Merged
craig[bot] merged 2 commits intocockroachdb:masterfrom
andreimatei:upgrades.roachpb.Version
Nov 16, 2022
Merged

upgrade: minor cleanups#91998
craig[bot] merged 2 commits intocockroachdb:masterfrom
andreimatei:upgrades.roachpb.Version

Conversation

@andreimatei
Copy link
Copy Markdown
Contributor

See individual commits.
Extracted from #91627

Release note: None
Epic: None

Upgrades were taking a reference to the job running them. Once upon a
time, this was allegedly used by some upgrade in order to checkpoint its
progress. Nobody uses it currently, and this patch removes it. We can
add it back if we need it again.
This reference was in my way because in cockroachdb#91627 I'm adding a testing mode
where upgrades do not run in jobs.

Release note: None
@andreimatei andreimatei requested review from a team and ajwerner November 16, 2022 17:34
@andreimatei andreimatei requested review from a team as code owners November 16, 2022 17:34
@andreimatei andreimatei removed request for a team November 16, 2022 17:35
@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.

Reviewed 26 of 26 files at r1, 19 of 19 files at r2, all commit messages.
Reviewable status: :shipit: complete! 0 of 0 LGTMs obtained (waiting on @andreimatei)

A lot of functions and structures were using the more complicated
clusterversion.ClusterVersion where roachpb.Version is all they need.
ClusterVersion is not plain data, so it was awkward to use it as map
keys and such.

Release note: None
Epic: None
@andreimatei andreimatei force-pushed the upgrades.roachpb.Version branch from 7d58778 to b258d20 Compare November 16, 2022 17:42
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! 0 of 0 LGTMs obtained (waiting on @ajwerner)

@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.

3 participants