Skip to content

Commit accc045

Browse files
committed
clusterversion, storage: bump MinSupported from v25.1 to v25.2
Bump MinSupported from v25.1 to v25.2 and update storage.pebbleFormatVersionMap. Epic: REL-2848 Release note: None
1 parent 4b66899 commit accc045

File tree

3 files changed

+6
-7
lines changed

3 files changed

+6
-7
lines changed

pkg/cli/testdata/ear-list

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ MANIFEST-000001:
2828
OPTIONS-000003:
2929
env type: Data, AES128_CTR
3030
keyID: bbb65a9d114c2a18740f27b6933b74f61018bd5adf545c153b48ffe6473336ef
31-
nonce: fa ba 07 9e 17 3f 2c 86 11 54 5b d8
32-
counter: 145968458
31+
nonce: 0c 07 ac 42 50 0d 38 20 3c 91 cf c0
32+
counter: 1731579598
3333
marker.datakeys.000001.COCKROACHDB_DATA_KEYS_000001_monolith:
3434
env type: Store, AES128_CTR
3535
keyID: f594229216d81add7811c4360212eb7629b578ef4eab6e5d05679b3c5de48867
@@ -38,8 +38,8 @@ marker.datakeys.000001.COCKROACHDB_DATA_KEYS_000001_monolith:
3838
marker.format-version.000008.021:
3939
env type: Data, AES128_CTR
4040
keyID: bbb65a9d114c2a18740f27b6933b74f61018bd5adf545c153b48ffe6473336ef
41-
nonce: 0c 07 ac 42 50 0d 38 20 3c 91 cf c0
42-
counter: 1731579598
41+
nonce: df 3a 47 28 5e fb 88 e3 9e b3 9b a3
42+
counter: 1505393531
4343
marker.manifest.000001.MANIFEST-000001:
4444
env type: Data, AES128_CTR
4545
keyID: bbb65a9d114c2a18740f27b6933b74f61018bd5adf545c153b48ffe6473336ef

pkg/clusterversion/cockroach_versions.go

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -311,7 +311,7 @@ var versionTable = [numKeys]roachpb.Version{
311311
const Latest Key = numKeys - 1
312312

313313
// MinSupported is the minimum logical cluster version supported by this branch.
314-
const MinSupported Key = V25_1
314+
const MinSupported Key = V25_2
315315

316316
// PreviousRelease is the logical cluster version of the previous release (which must
317317
// have at least an RC build published).

pkg/storage/pebble.go

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -397,7 +397,7 @@ const mvccWallTimeIntervalCollector = "MVCCTimeInterval"
397397
// Cockroach code relies on unconditionally (like range keys). New stores are by
398398
// default created with this version. It should correspond to the minimum
399399
// supported binary version.
400-
const MinimumSupportedFormatVersion = pebble.FormatColumnarBlocks
400+
const MinimumSupportedFormatVersion = pebble.FormatTableFormatV6
401401

402402
// DefaultPebbleOptions returns the default pebble options.
403403
func DefaultPebbleOptions() *pebble.Options {
@@ -2157,7 +2157,6 @@ func (p *Pebble) CreateCheckpoint(dir string, spans []roachpb.Span) error {
21572157
// named version, it can be assumed all *nodes* have ratcheted to the pebble
21582158
// version associated with it, since they did so during the fence version.
21592159
var pebbleFormatVersionMap = map[clusterversion.Key]pebble.FormatMajorVersion{
2160-
clusterversion.V25_1: pebble.FormatColumnarBlocks,
21612160
clusterversion.V25_2: pebble.FormatTableFormatV6,
21622161
}
21632162

0 commit comments

Comments
 (0)