Commit 26a5f93
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>
File tree
92 files changed
+4193
-22446
lines changed- pkg
- ccl/logictestccl
- testdata/logic_test
- tests
- local-mixed-25.3
- local-mixed-25.4
- cli/testdata/declarative-rules
- clusterversion
- runbooks
- roachprod
- config
- vm
- aws
- gce
- sql
- catalog/bootstrap
- data
- logictest
- logictestbase
- testdata/logic_test
- tests
- cockroach-go-testserver-25.3
- cockroach-go-testserver-25.4
- local-leased-descriptors
- local-mixed-25.3
- local-mixed-25.4
- schemachanger/scplan
- internal/rules/release_25_3
- testdata
- sqlitelogictest/tests
- local-mixed-25.3
- local-mixed-25.4
- storage
- upgrade/upgrades
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| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
60 | 60 | | |
61 | 61 | | |
62 | 62 | | |
63 | | - | |
64 | 63 | | |
65 | 64 | | |
66 | 65 | | |
| |||
520 | 519 | | |
521 | 520 | | |
522 | 521 | | |
523 | | - | |
524 | 522 | | |
525 | 523 | | |
526 | 524 | | |
527 | 525 | | |
528 | 526 | | |
529 | 527 | | |
530 | | - | |
531 | 528 | | |
532 | 529 | | |
533 | 530 | | |
| |||
614 | 611 | | |
615 | 612 | | |
616 | 613 | | |
617 | | - | |
618 | 614 | | |
619 | 615 | | |
620 | 616 | | |
| |||
647 | 643 | | |
648 | 644 | | |
649 | 645 | | |
650 | | - | |
651 | 646 | | |
652 | 647 | | |
653 | 648 | | |
| |||
1002 | 997 | | |
1003 | 998 | | |
1004 | 999 | | |
1005 | | - | |
1006 | 1000 | | |
1007 | 1001 | | |
1008 | 1002 | | |
| |||
2100 | 2094 | | |
2101 | 2095 | | |
2102 | 2096 | | |
2103 | | - | |
2104 | 2097 | | |
2105 | 2098 | | |
2106 | 2099 | | |
2107 | 2100 | | |
2108 | 2101 | | |
2109 | 2102 | | |
2110 | | - | |
2111 | 2103 | | |
2112 | 2104 | | |
2113 | 2105 | | |
| |||
2305 | 2297 | | |
2306 | 2298 | | |
2307 | 2299 | | |
2308 | | - | |
2309 | | - | |
2310 | 2300 | | |
2311 | 2301 | | |
2312 | 2302 | | |
| |||
2387 | 2377 | | |
2388 | 2378 | | |
2389 | 2379 | | |
2390 | | - | |
2391 | 2380 | | |
2392 | 2381 | | |
2393 | 2382 | | |
| |||
| Original file line number | Diff line number | Diff line change | |
|---|---|---|---|
| |||
930 | 930 | | |
931 | 931 | | |
932 | 932 | | |
933 | | - | |
| 933 | + | |
934 | 934 | | |
935 | 935 | | |
936 | 936 | | |
937 | | - | |
| 937 | + | |
938 | 938 | | |
939 | 939 | | |
940 | 940 | | |
| |||
This file was deleted.
0 commit comments