Skip to content

Commit 26a5f93

Browse files
craig[bot]celialapetermattis
committed
158225: clusterversion: bump MinSupported from v25.3 to v25.4 r=fqazi a=celiala Part of the quarterly M.4 "Bump MinSupported" task as outlined in `pkg/clusterversion/README.md`. This PR bumps MinSupported from v25.3 to v25.4 in 5 commits: Fixes: #158383 #### Commit 1: Refactor CLAUDE.md into modular runbooks Refactors the monolithic 4114-line CLAUDE.md into a modular structure: - Main CLAUDE.md (113 lines): Overview, navigation, and general guidance - Individual runbooks in `pkg/clusterversion/runbooks/`: - R1_prepare_for_beta.md - R2_mint_release.md - M1_bump_current_version.md - M2_enable_mixed_cluster_logic_tests.md - M3_enable_upgrade_tests.md - M4_bump_minsupported_version.md - Updated README.md Claude Prompts to reference new runbook locations This makes each runbook easier to read, maintain, and use independently. **Note:** This commit also adds Step 7 to the M.1 runbook documenting the requirement to update `pkg/storage/pebble.go` with a version mapping for the new release, which was missing from the original M.1 documentation. #### Commit 2: Bump MinSupported from v25.3 to v25.4 - Updated MinSupported constant in `pkg/clusterversion/cockroach_versions.go` from V25_3 to V25_4 - Updated `pkg/storage/pebble.go`: - Added V25_4 entry to pebbleFormatVersionMap with FormatMarkForCompactionInVersionEdit (fixes missing entry that should have been added during M.1) - Updated MinimumSupportedFormatVersion from FormatValueSeparation to FormatMarkForCompactionInVersionEdit After this change, clusters running v25.3 can no longer connect to clusters running master, and direct upgrades from v25.3 to master are no longer supported. #### Commit 3: Remove schema changer rules for release_25_3 - Deleted entire `release_25_3` rules directory (~13,000 lines) - Removed import and registry entry from plan.go - Updated Bazel dependencies These frozen schema changer rules are no longer needed since v25.3 nodes can no longer participate in mixed-version clusters. #### Commit 4: Remove bootstrap data for v25.3 - Deleted 25_3_system.keys, 25_3_system.sha256 - Deleted 25_3_tenant.keys, 25_3_tenant.sha256 - Removed V25_3 entry from initialValuesFactoryByKey map - Removed go:embed variables for v25.3 bootstrap data - Updated BUILD.bazel to remove embedsrcs Bootstrap data files are no longer needed since clusters can no longer start at v25.3 (below MinSupported). #### Commit 5: Remove local-mixed-25.3 test configuration - Removed local-mixed-25.3 config from logictestbase.go - Removed from default-configs and schema-locked-disabled sets - Deleted generated test directories for local-mixed-25.3 - Removed all skipif/onlyif references from 64 logic test files - Regenerated Bazel BUILD files via `./dev gen bazel` The local-mixed-25.3 configuration simulates a mixed-version cluster with v25.3 nodes, which can no longer connect after bumping MinSupported. --- **Reference PR:** #157767 (v25.2 → v25.3 MinSupported bump) Epic: None Release note: None 158532: roachprod: add GCE hyperdisk-balanced support and misc improvements r=petermattis a=petermattis Add support for GCE hyperdisk-balanced disk type with new flags: - --gce-pd-volume-provisioned-iops: Required for hyperdisk-balanced, optional for pd-extreme - --gce-pd-volume-provisioned-throughput: Required for hyperdisk-balanced Additional improvements: - Move google_compute_engine to front of SSH key list to avoid passphrase prompts when connecting to GCE VMs (the key is typically not passphrase-protected) - Increase AWS gp3 max IOPS validation from 16000 to 80000 - Add AWS m8g/m8gd ARM instance type detection Release note: None Epic: None Co-authored-by: Celia La <celia@cockroachlabs.com> Co-authored-by: Peter Mattis <petermattis@gmail.com>
3 parents 4bcccc8 + 7d4fb35 + 372b9ab commit 26a5f93

File tree

92 files changed

+4193
-22446
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

92 files changed

+4193
-22446
lines changed

pkg/BUILD.bazel

Lines changed: 0 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -60,7 +60,6 @@ ALL_TESTS = [
6060
"//pkg/ccl/logictestccl/tests/fakedist-vec-off:fakedist-vec-off_test",
6161
"//pkg/ccl/logictestccl/tests/fakedist:fakedist_test",
6262
"//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
63-
"//pkg/ccl/logictestccl/tests/local-mixed-25.3:local-mixed-25_3_test",
6463
"//pkg/ccl/logictestccl/tests/local-mixed-25.4:local-mixed-25_4_test",
6564
"//pkg/ccl/logictestccl/tests/local-prepared:local-prepared_test",
6665
"//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
@@ -520,14 +519,12 @@ ALL_TESTS = [
520519
"//pkg/sql/logictest/logictestbase:logictestbase_test",
521520
"//pkg/sql/logictest/tests/5node-disk:5node-disk_test",
522521
"//pkg/sql/logictest/tests/5node:5node_test",
523-
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.3:cockroach-go-testserver-25_3_test",
524522
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.4:cockroach-go-testserver-25_4_test",
525523
"//pkg/sql/logictest/tests/fakedist-disk:fakedist-disk_test",
526524
"//pkg/sql/logictest/tests/fakedist-vec-off:fakedist-vec-off_test",
527525
"//pkg/sql/logictest/tests/fakedist:fakedist_test",
528526
"//pkg/sql/logictest/tests/local-leased-descriptors:local-leased-descriptors_test",
529527
"//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
530-
"//pkg/sql/logictest/tests/local-mixed-25.3:local-mixed-25_3_test",
531528
"//pkg/sql/logictest/tests/local-mixed-25.4:local-mixed-25_4_test",
532529
"//pkg/sql/logictest/tests/local-prepared:local-prepared_test",
533530
"//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
@@ -614,7 +611,6 @@ ALL_TESTS = [
614611
"//pkg/sql/schemachanger/scpb:scpb_test",
615612
"//pkg/sql/schemachanger/scplan/internal/opgen:opgen_test",
616613
"//pkg/sql/schemachanger/scplan/internal/rules/current:current_test",
617-
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3_test",
618614
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4_test",
619615
"//pkg/sql/schemachanger/scplan/internal/scgraph:scgraph_test",
620616
"//pkg/sql/schemachanger/scplan:scplan_test",
@@ -647,7 +643,6 @@ ALL_TESTS = [
647643
"//pkg/sql/sqlitelogictest/tests/fakedist-vec-off:fakedist-vec-off_test",
648644
"//pkg/sql/sqlitelogictest/tests/fakedist:fakedist_test",
649645
"//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
650-
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.3:local-mixed-25_3_test",
651646
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.4:local-mixed-25_4_test",
652647
"//pkg/sql/sqlitelogictest/tests/local-prepared:local-prepared_test",
653648
"//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",
@@ -1002,7 +997,6 @@ GO_TARGETS = [
1002997
"//pkg/ccl/logictestccl/tests/fakedist-vec-off:fakedist-vec-off_test",
1003998
"//pkg/ccl/logictestccl/tests/fakedist:fakedist_test",
1004999
"//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
1005-
"//pkg/ccl/logictestccl/tests/local-mixed-25.3:local-mixed-25_3_test",
10061000
"//pkg/ccl/logictestccl/tests/local-mixed-25.4:local-mixed-25_4_test",
10071001
"//pkg/ccl/logictestccl/tests/local-prepared:local-prepared_test",
10081002
"//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
@@ -2100,14 +2094,12 @@ GO_TARGETS = [
21002094
"//pkg/sql/logictest/logictestbase:logictestbase_test",
21012095
"//pkg/sql/logictest/tests/5node-disk:5node-disk_test",
21022096
"//pkg/sql/logictest/tests/5node:5node_test",
2103-
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.3:cockroach-go-testserver-25_3_test",
21042097
"//pkg/sql/logictest/tests/cockroach-go-testserver-25.4:cockroach-go-testserver-25_4_test",
21052098
"//pkg/sql/logictest/tests/fakedist-disk:fakedist-disk_test",
21062099
"//pkg/sql/logictest/tests/fakedist-vec-off:fakedist-vec-off_test",
21072100
"//pkg/sql/logictest/tests/fakedist:fakedist_test",
21082101
"//pkg/sql/logictest/tests/local-leased-descriptors:local-leased-descriptors_test",
21092102
"//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
2110-
"//pkg/sql/logictest/tests/local-mixed-25.3:local-mixed-25_3_test",
21112103
"//pkg/sql/logictest/tests/local-mixed-25.4:local-mixed-25_4_test",
21122104
"//pkg/sql/logictest/tests/local-prepared:local-prepared_test",
21132105
"//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
@@ -2305,8 +2297,6 @@ GO_TARGETS = [
23052297
"//pkg/sql/schemachanger/scplan/internal/opgen:opgen_test",
23062298
"//pkg/sql/schemachanger/scplan/internal/rules/current:current",
23072299
"//pkg/sql/schemachanger/scplan/internal/rules/current:current_test",
2308-
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3",
2309-
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3_test",
23102300
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4",
23112301
"//pkg/sql/schemachanger/scplan/internal/rules/release_25_4:release_25_4_test",
23122302
"//pkg/sql/schemachanger/scplan/internal/rules:rules",
@@ -2387,7 +2377,6 @@ GO_TARGETS = [
23872377
"//pkg/sql/sqlitelogictest/tests/fakedist-vec-off:fakedist-vec-off_test",
23882378
"//pkg/sql/sqlitelogictest/tests/fakedist:fakedist_test",
23892379
"//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
2390-
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.3:local-mixed-25_3_test",
23912380
"//pkg/sql/sqlitelogictest/tests/local-mixed-25.4:local-mixed-25_4_test",
23922381
"//pkg/sql/sqlitelogictest/tests/local-prepared:local-prepared_test",
23932382
"//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",

pkg/ccl/logictestccl/testdata/logic_test/triggers

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -930,11 +930,11 @@ statement ok
930930
CREATE TRIGGER foo AFTER INSERT ON xy FOR EACH ROW EXECUTE FUNCTION trigger_func();
931931

932932
# Relations are referenced by name, so renaming the table is not allowed.
933-
onlyif config local-legacy-schema-changer local-mixed-25.3
933+
onlyif config local-legacy-schema-changer
934934
statement error pgcode 2BP01 cannot rename relation "t" because trigger "foo" on table "xy" depends on it
935935
ALTER TABLE t RENAME TO t2;
936936

937-
skipif config local-legacy-schema-changer local-mixed-25.3
937+
skipif config local-legacy-schema-changer
938938
statement error pgcode 2BP01 cannot rename relation "test.public.t" because trigger "foo" on table "xy" depends on it
939939
ALTER TABLE t RENAME TO t2;
940940

pkg/ccl/logictestccl/tests/local-mixed-25.3/BUILD.bazel

Lines changed: 0 additions & 28 deletions
This file was deleted.

0 commit comments

Comments
 (0)