clusterversion: create 24.3 version #128616

RaduBerinde · 2024-08-08T18:14:37Z

Add version key constant for new release (e.g. V24.2), equal to Latest
Update PreviousRelease constant
Add start version (e.g. V24.2Start with version 24.1-2)
Update pkg/build/version.txt to the new version (e.g. v24.2.0-alpha.00000000)
Add mixed version logictest config for the replaced version
Update the scplan rules in pkg/sql/schemachanger/scplan/internal/rules
Create new roachtest fixtures for the previous version
Create new SQL bootstrap data
Update releases file

Epic: REL-1163
Release note: None
Fixes #128747

blathers-crl · 2024-08-08T18:14:41Z

Your pull request contains more than 1000 changes. It is strongly encouraged to split big PRs into smaller chunks.

_{🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is dev-inf.}

cockroach-teamcity · 2024-08-08T18:14:48Z

This change is

arulajmani

Reviewable status: complete! 0 of 0 LGTMs obtained (waiting on @celiala, @RaduBerinde, and @renatolabs)

pkg/clusterversion/cockroach_versions.go line 334 at r1 (raw file):

	V24_2_TenantRates:                 {Major: 24, Minor: 1, Internal: 8},
	V24_2_DeleteTenantSettingsVersion: {Major: 24, Minor: 1, Internal: 10},
	V24_2_LeaseMinTimestamp:           {Major: 24, Minor: 1, Internal: 12},

I don't think we should change V24_2_LeaseMinTimestamp. I only piggybacked off it in #128647. It was introduced before and is used elsewhere. It exists on release-24.2, so I imagine making this change would cause issues.

Instead, we should leave this as is, and introduce a new V24_3_StoreLivenessEnabled version after V24_3Start. Then, if we use this in replica_store_liveness.go, I think all tests should pass. I had some words around this in this TODO:

cockroach/pkg/kv/kvserver/replica_store_liveness.go

Lines 75 to 78 in 167047e

    
           // liveness is enabled. The other incorrect bit about this version check is 
        
           // that it re-uses clusterversion.V24_2_LeaseMinTimestamp; we should instead 
        
           // introduce a new version (V24_3_StoreLivenessEnabled); this can only happen 
        
           // once https://github.com/cockroachdb/cockroach/pull/128616 lands.

RaduBerinde

Reviewable status: complete! 0 of 0 LGTMs obtained (waiting on @arulajmani, @celiala, and @renatolabs)

pkg/clusterversion/cockroach_versions.go line 334 at r1 (raw file):

Previously, arulajmani (Arul Ajmani) wrote…

I don't think we should change V24_2_LeaseMinTimestamp. I only piggybacked off it in #128647. It was introduced before and is used elsewhere. It exists on release-24.2, so I imagine making this change would cause issues.

Instead, we should leave this as is, and introduce a new V24_3_StoreLivenessEnabled version after V24_3Start. Then, if we use this in replica_store_liveness.go, I think all tests should pass. I had some words around this in this TODO:

cockroach/pkg/kv/kvserver/replica_store_liveness.go

Lines 75 to 78 in 167047e

// liveness is enabled. The other incorrect bit about this version check is

// that it re-uses clusterversion.V24_2_LeaseMinTimestamp; we should instead

// introduce a new version (V24_3_StoreLivenessEnabled); this can only happen

// once https://github.com/cockroachdb/cockroach/pull/128616 lands.

Ohh I see now. I had thought I looked at the release-24.2branch and didn't see the gate but I must have messed something up. This makes a lot more sense now. Done. Thanks!!

arulajmani

StoreLiveness related changes

Reviewed 2 of 10 files at r2.
Reviewable status: complete! 1 of 0 LGTMs obtained (waiting on @celiala, @RaduBerinde, and @renatolabs)

pkg/clusterversion/cockroach_versions.go line 334 at r1 (raw file):

Previously, RaduBerinde wrote…

Ohh I see now. I had thought I looked at the release-24.2branch and didn't see the gate but I must have messed something up. This makes a lot more sense now. Done. Thanks!!

Thanks, and sorry for the trouble my hack to merge that PR caused you.

pkg/clusterversion/cockroach_versions.go line 278 at r2 (raw file):

	V24_3_Start

	// V24_3_StoreLivenessEnabled TODO

nit: V24_3_StoreLivenessEnabled is the earliest version which supports the use of the StoreLiveness fabric.

celiala

thank you! LGTM

(modulo reverting V24_2_LeaseMinTimestamp back to original value, as discussed)

Reviewed 43 of 49 files at r1, 10 of 10 files at r2, all commit messages.
Reviewable status: complete! 1 of 0 LGTMs obtained (waiting on @RaduBerinde and @renatolabs)

pkg/clusterversion/cockroach_versions.go line 346 at r2 (raw file):

	V24_2_LeaseMinTimestamp:           {Major: 24, Minor: 2, Internal: 12},

	V24_2: {Major: 24, Minor: 2, Internal: 0},

oops. I added this to release-24.2 but forgot to also add this to master. sorry, my bad (noted in my runbook for next time).x//.x.

RaduBerinde · 2024-08-11T02:51:48Z

pkg/clusterversion/cockroach_versions.go line 346 at r2 (raw file):

Previously, celiala wrote…

oops. I added this to release-24.2 but forgot to also add this to master. sorry, my bad (noted in my runbook for next time).x//.x.

No, it wouldn't have worked - we can't have an internal=0 as the latest version of master (a dev branch). I think it always needs to be done together with starting the new release versions.

RaduBerinde

Reviewable status: complete! 1 of 0 LGTMs obtained (waiting on @arulajmani, @celiala, and @renatolabs)

pkg/clusterversion/cockroach_versions.go line 278 at r2 (raw file):

Previously, arulajmani (Arul Ajmani) wrote…

nit: V24_3_StoreLivenessEnabled is the earliest version which supports the use of the StoreLiveness fabric.

Oops, thanks, done!

renatolabs

LGTM!

RaduBerinde · 2024-08-12T15:52:35Z

TFTRs!

bors r+

craig · 2024-08-12T16:26:20Z

Build failed (retrying...):

unit_tests

craig · 2024-08-12T17:24:53Z

Build failed (retrying...):

check_generated_code

craig · 2024-08-12T17:31:32Z

Build failed (retrying...):

check_generated_code

craig · 2024-08-12T18:58:13Z

Build failed (retrying...):

check_generated_code

craig · 2024-08-12T19:06:01Z

Build failed:

check_generated_code

- [x] Add version key constant for new release (e.g. `V24.2`), equal to `Latest` - [x] Update `PreviousRelease` constant - [x] Add start version (e.g. `V24.2Start` with version `24.1-2`) - [x] Update `pkg/build/version.txt` to the new version (e.g. `v24.2.0-alpha.00000000`) - [x] Add mixed version logictest config for the replaced version - [x] Update the `scplan` rules in `pkg/sql/schemachanger/scplan/internal/rules` - [x] Create new roachtest fixtures for the previous version - [x] Create new SQL bootstrap data - [x] Update releases file This change does not update the version skipping logic; in a follow-up change we will enable direct 24.1->24.3 upgrade without a special env flag. Epic: REL-1163 Release note: None

RaduBerinde · 2024-08-12T20:39:54Z

bors r+

craig · 2024-08-12T21:12:24Z

Build succeeded:

RaduBerinde · 2024-08-12T21:49:24Z

Correction: this was REL-1045

RaduBerinde force-pushed the create-version-24.3 branch 3 times, most recently from 84f9536 to 82e0ba0 Compare August 10, 2024 08:17

RaduBerinde mentioned this pull request Aug 10, 2024

kv: panic in HandleRaftUncoalescedRequest in mixed cluster #128747

Closed

RaduBerinde force-pushed the create-version-24.3 branch 2 times, most recently from 724e234 to 85cbea2 Compare August 10, 2024 16:16

RaduBerinde requested review from celiala, arulajmani and renatolabs August 10, 2024 16:31

arulajmani reviewed Aug 10, 2024

View reviewed changes

RaduBerinde force-pushed the create-version-24.3 branch from 85cbea2 to b70eb66 Compare August 10, 2024 18:17

RaduBerinde commented Aug 10, 2024

View reviewed changes

arulajmani approved these changes Aug 10, 2024

View reviewed changes

celiala approved these changes Aug 11, 2024

View reviewed changes

RaduBerinde commented Aug 11, 2024

View reviewed changes

RaduBerinde force-pushed the create-version-24.3 branch from b70eb66 to 479591d Compare August 11, 2024 05:34

RaduBerinde marked this pull request as ready for review August 11, 2024 07:24

RaduBerinde requested review from a team as code owners August 11, 2024 07:24

RaduBerinde requested review from srosenberg and removed request for a team August 11, 2024 07:24

RaduBerinde requested review from mw5h and removed request for a team August 11, 2024 07:24

renatolabs approved these changes Aug 12, 2024

View reviewed changes

RaduBerinde force-pushed the create-version-24.3 branch from 479591d to 7427786 Compare August 12, 2024 14:59

RaduBerinde force-pushed the create-version-24.3 branch from 7427786 to 9e03322 Compare August 12, 2024 20:25

craig bot merged commit f6b88f5 into cockroachdb:master Aug 12, 2024
21 of 23 checks passed

RaduBerinde deleted the create-version-24.3 branch August 12, 2024 21:49

arulajmani mentioned this pull request Aug 12, 2024

kv: support gradual rollout of Leader leases #128815

Merged

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

clusterversion: create 24.3 version #128616

clusterversion: create 24.3 version #128616

RaduBerinde commented Aug 8, 2024 •

edited

Loading

blathers-crl bot commented Aug 8, 2024

cockroach-teamcity commented Aug 8, 2024

arulajmani left a comment

RaduBerinde left a comment

arulajmani left a comment

celiala left a comment

RaduBerinde commented Aug 11, 2024

RaduBerinde left a comment

renatolabs left a comment

RaduBerinde commented Aug 12, 2024

craig bot commented Aug 12, 2024

craig bot commented Aug 12, 2024

craig bot commented Aug 12, 2024

craig bot commented Aug 12, 2024

craig bot commented Aug 12, 2024

RaduBerinde commented Aug 12, 2024

craig bot commented Aug 12, 2024

RaduBerinde commented Aug 12, 2024

	// liveness is enabled. The other incorrect bit about this version check is
	// that it re-uses clusterversion.V24_2_LeaseMinTimestamp; we should instead
	// introduce a new version (V24_3_StoreLivenessEnabled); this can only happen
	// once https://github.com/cockroachdb/cockroach/pull/128616 lands.

clusterversion: create 24.3 version #128616

clusterversion: create 24.3 version #128616

Conversation

RaduBerinde commented Aug 8, 2024 • edited Loading

blathers-crl bot commented Aug 8, 2024

cockroach-teamcity commented Aug 8, 2024

arulajmani left a comment

Choose a reason for hiding this comment

RaduBerinde left a comment

Choose a reason for hiding this comment

arulajmani left a comment

Choose a reason for hiding this comment

celiala left a comment

Choose a reason for hiding this comment

RaduBerinde commented Aug 11, 2024

RaduBerinde left a comment

Choose a reason for hiding this comment

renatolabs left a comment

Choose a reason for hiding this comment

RaduBerinde commented Aug 12, 2024

craig bot commented Aug 12, 2024

craig bot commented Aug 12, 2024

craig bot commented Aug 12, 2024

craig bot commented Aug 12, 2024

craig bot commented Aug 12, 2024

RaduBerinde commented Aug 12, 2024

craig bot commented Aug 12, 2024

RaduBerinde commented Aug 12, 2024

RaduBerinde commented Aug 8, 2024 •

edited

Loading