Skip to content

clusterversion: bump MinSupported from v25.4 to v26.1#171183

Closed
celiala wants to merge 6 commits into
cockroachdb:masterfrom
celiala:bump-minsupported-26.2
Closed

clusterversion: bump MinSupported from v25.4 to v26.1#171183
celiala wants to merge 6 commits into
cockroachdb:masterfrom
celiala:bump-minsupported-26.2

Conversation

@celiala

@celiala celiala commented May 29, 2026

Copy link
Copy Markdown
Contributor

Part of the quarterly M.4 "Bump MinSupported" task.

Bumps MinSupported from V25_4 to V26_1. After this change, clusters below 26.1 must first upgrade to 26.1, in order to subsequently upgrade to master.

Epic: None

@trunk-io

trunk-io Bot commented May 29, 2026

Copy link
Copy Markdown
Contributor

Merging to master in this repository is managed by Trunk.

  • To merge this pull request, check the box to the left or comment /trunk merge below.

After your PR is submitted to the merge queue, this comment will be automatically updated with its status. If the PR fails, failure details will also be posted here

@blathers-crl

blathers-crl Bot commented May 29, 2026

Copy link
Copy Markdown

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

Copy link
Copy Markdown
Member

This change is Reviewable

@celiala celiala force-pushed the bump-minsupported-26.2 branch from 84d5ae8 to bb4636e Compare May 31, 2026 02:07
celiala added 4 commits June 1, 2026 09:05
Part of the quarterly M.4 "Bump MinSupported" task.

This commit updates the MinSupported constant from V25_4 to V26_1.
After this change, clusters running v25.4 can no longer connect to master.

Updates MinimumSupportedFormatVersion in pebble.go from FormatV2BlobFiles
to FormatMarkForCompactionInVersionEdit, matching the pebble format
version associated with V26_1.

Release note: None
Epic: None
Part of the quarterly M.4 "Bump MinSupported" task.

After bumping MinSupported from v25.4 to v26.1, the frozen schema
changer rules for release 25.4 are no longer needed.

Release note: None
Epic: None
Part of the quarterly M.4 "Bump MinSupported" task.

This commit removes the bootstrap data for v25.4, which is now below
the minimum supported version.

Release note: None
Epic: None
Part of the quarterly M.4 "Bump MinSupported" task.

Updates LogicTest headers for mixed-version tests to target v26.1
instead of v25.4.

Release note: None
Epic: None
@celiala celiala force-pushed the bump-minsupported-26.2 branch from bb4636e to 8420aea Compare June 1, 2026 16:08
Part of the quarterly M.4 "Bump MinSupported" task.

After bumping MinSupported from v25.4 to v26.1, the local-mixed-25.4
test configuration is no longer needed.

Changes:
- Removed local-mixed-25.4 config from logictestbase.go
- Updated nightly build script (sqllogic_corpus_nightly_impl.sh) to
  use local-mixed-26.1 for the corpus collection
- Deleted test directories (logictest and sqlitelogictest)
- Removed local-mixed-25.4 references from test files
- Regenerated Bazel BUILD files

Release note: None
Epic: None
@celiala celiala force-pushed the bump-minsupported-26.2 branch from 8420aea to a01b576 Compare June 1, 2026 18:32
Two improvements to prevent CI failures in future M.4 runs:

1. Runbook (M4_bump_minsupported_version_QUICK.md):
   - Consolidate sed commands for removing old mixed config refs into
     a single pass, handling all directive forms (# LogicTest:, skipif,
     onlyif) at once
   - Add explicit validation step: run './dev gen bazel' and verify
     workspace is clean before committing (not just before pushing)
   - Add rebase warning: auto-merge can silently reintroduce old
     config references from new master commits; always re-run the
     cleanup grep after rebasing
   - Update troubleshooting entry for 'panic: unknown config name'
     to mention the rebase scenario

2. Pre-push hook (.claude/hooks/pre-push-generate.sh):
   - Remove './dev generate' execution from hook; it was timing out
     in Claude Code's hook system, allowing the push to proceed before
     the hook could block it
   - Replace with a fast check: scan for dirty BUILD.bazel and
     generated_test.go files and block if any are uncommitted
   - The generate step now belongs in the commit workflow (per runbook),
     not the push hook

Release note: None
@celiala celiala force-pushed the bump-minsupported-26.2 branch from 44e5bc2 to f7d74dc Compare June 2, 2026 04:23
@celiala celiala closed this Jun 3, 2026
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.

2 participants