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: remove V23_1 checks #124286

Merged
merged 1 commit into from
May 17, 2024

Conversation

RaduBerinde
Copy link
Member

@RaduBerinde RaduBerinde commented May 16, 2024

Remove all IsActive checks for 23.1 version. Note that this code
could/should have been removed in the 24.1 cycle.

Epic: none
Release note: None

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@RaduBerinde RaduBerinde force-pushed the old-gate-cleanup-last branch 4 times, most recently from 4f614f1 to 22c3285 Compare May 16, 2024 19:47
@RaduBerinde RaduBerinde marked this pull request as ready for review May 16, 2024 19:47
@RaduBerinde RaduBerinde requested review from a team as code owners May 16, 2024 19:47
@RaduBerinde RaduBerinde requested review from nameisbhaskar, vidit-bhat, dt, wenyihu6, nkodali, rail, celiala and a team and removed request for a team May 16, 2024 19:47
Copy link
Member

@rail rail left a comment

Choose a reason for hiding this comment

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

:feelsgood:
:lgtm:

Reviewed 45 of 45 files at r1, all commit messages.
Reviewable status: :shipit: complete! 1 of 0 LGTMs obtained (waiting on @celiala, @dt, @nameisbhaskar, @nkodali, @vidit-bhat, and @wenyihu6)

Copy link
Collaborator

@celiala celiala left a comment

Choose a reason for hiding this comment

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

thank you!! :lgtm:

Reviewed 45 of 45 files at r1, all commit messages.
Reviewable status: :shipit: complete! 2 of 0 LGTMs obtained (waiting on @dt, @nameisbhaskar, @nkodali, @vidit-bhat, and @wenyihu6)

@RaduBerinde
Copy link
Member Author

bors r+

craig bot pushed a commit that referenced this pull request May 17, 2024
124286: clusterversion: remove V23_1 r=RaduBerinde a=RaduBerinde

Remove 23.1 version and all code checking for it. Note that this code
could/should have been removed in the 24.1 cycle.

Epic: none
Release note: None

Co-authored-by: Radu Berinde <radu@cockroachlabs.com>
@craig
Copy link
Contributor

craig bot commented May 17, 2024

Build failed:

@RaduBerinde
Copy link
Member Author

I had a mistake in restore_job.go. I did a bit of refactoring to remove the flag that is now always set and remove dead code. @dt or @msbutler could you take a look over the backupccl changes?

@RaduBerinde RaduBerinde force-pushed the old-gate-cleanup-last branch 2 times, most recently from 7898354 to 4f7115f Compare May 17, 2024 13:25
@dt
Copy link
Member

dt commented May 17, 2024

Hmm. The restore changes raise an interesting question about resuming jobs from older versions and indeed about whether we can delete old minted cluster versions at all.

the upgrade system ensures that if you observe this version that all nodes are on new code, stay on newer code and migrations run. Currently there is no migration that fails or wait or anything if an older job still exists in the jobs system.

the check in restore that is deleted here is not a IsActive check that we known is always true, but rather a check to see what version created the job since that will mean different fields can or cannot be relied on.

In theory we could expect to see a job created by 23.1 in any future version, long after 23.1 is below min version, unless we write a migration to block upgrades or something.

So while we can delete IsActive gates that are noops due to being below min supported, I’m not sure we can delete the actual minted cluster versions while there is still code comparing them to versions persisted in something like a job?

@RaduBerinde
Copy link
Member Author

Ok, I will revert those changes and leave V23_1. But note that the relevant code won't be tested at all.. (that would probably require some fixtures generated from other branches).

Maybe the safer thing would be to fail the job if the version that created it is less than MinSupported?

Remove all `IsActive` checks for 23.1 version. Note that this code
could/should have been removed in the 24.1 cycle.

Epic: none
Release note: None
@dt
Copy link
Member

dt commented May 17, 2024

Yeah, I wonder if jobs should just do that by default and long-lived jobs should be responsible for hauling up the “creation” version in vX if they know they’re the same in vX as vX-1

@RaduBerinde RaduBerinde changed the title clusterversion: remove V23_1 clusterversion: remove V23_1 checks May 17, 2024
@RaduBerinde
Copy link
Member Author

Ok, for now I am leaving that code alone and I filed #124351.

@RaduBerinde
Copy link
Member Author

TFTR!

bors r+

@craig craig bot merged commit 9d60314 into cockroachdb:master May 17, 2024
21 of 22 checks passed
@RaduBerinde RaduBerinde deleted the old-gate-cleanup-last branch May 17, 2024 22:15
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.

None yet

5 participants