Merge #149494

149494: clusterversion: move to 25.4 version r=annrpom a=annrpom

**Checklist**:

- [x] Add version key constant for new release (e.g. `V24_2`), equal to `Latest`. Note that we do NOT update the `PreviousRelease` constant. We can only update the `PreviousRelease` when an RC is published, which is needed for upgrade roachtests.
- [x] Add final version for the previous release (e.g. `V24_1`).
- [x] Add start version (e.g. `V24_2Start` with version `24.1-2`) and add a new first upgrade for it (in `upgrades/upgrades.go`).
- [x] Update `roachpb.successorSeries` map and update `TestReleaseSeriesSuccessor`
- [x] Update `pkg/build/version.txt` to the new version (e.g. `v24.2.0-alpha.00000000`)
- [x] Update the `scplan` rules in `pkg/sql/schemachanger/scplan/internal/rules`:
  - copy the contents of `current` into a new release directory for the previous version (e.g. `release_24_1`)
  - change package name in all files (including `BUILD.bazel`), and update the version in `current/helpers.go`
  - update `rulesForReleases` in `scplan/plan.go`
  - rewrite the test outputs: `./dev test pkg/sql/schemachanger/scplan/internal/rules/... --rewrite`
  - rewrite `TestDeclarativeRules` output: `./dev test pkg/cli -f DeclarativeRules --rewrite`
- [x] Update releases file: ``` bazel build //pkg/cmd/release:release _bazel/bin/pkg/cmd/release/release_/release update-releases-file ``` Note that the forked release version will disappear from the releases file. This is what we want; if it is here, we will attempt to run upgrade tests against it.
- [x] Regenerate expected test data as needed (usually `pkg/sql/catalog/systemschema_test` and some logictests).

Epic: REL-2733
Release note: None

Co-authored-by: Annie Pompa <[email protected]>

Author: craig[bot]

docs/generated/settings/settings-for-tenants.txt

@@ -417,4 +417,4 @@ trace.zipkin.collector	string		the address of a Zipkin instance to receive trace
 ui.database_locality_metadata.enabled	boolean	true	if enabled shows extended locality data about databases and tables in DB Console which can be expensive to compute	application
 ui.default_timezone	string		the default timezone used to format timestamps in the ui	application
 ui.display_timezone	enumeration	etc/utc	the timezone used to format timestamps in the ui. This setting is deprecatedand will be removed in a future version. Use the 'ui.default_timezone' setting instead. 'ui.default_timezone' takes precedence over this setting. [etc/utc = 0, america/new_york = 1]	application
-version	version	1000025.2-upgrading-to-1000025.3-step-010	set the active cluster version in the format '<major>.<minor>'	application
+version	version	1000025.3-upgrading-to-1000025.4-step-002	set the active cluster version in the format '<major>.<minor>'	application

docs/generated/settings/settings.html

@@ -375,6 +375,6 @@
 <tr><td><div id="setting-ui-database-locality-metadata-enabled" class="anchored"><code>ui.database_locality_metadata.enabled</code></div></td><td>boolean</td><td><code>true</code></td><td>if enabled shows extended locality data about databases and tables in DB Console which can be expensive to compute</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
 <tr><td><div id="setting-ui-default-timezone" class="anchored"><code>ui.default_timezone</code></div></td><td>string</td><td><code></code></td><td>the default timezone used to format timestamps in the ui</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
 <tr><td><div id="setting-ui-display-timezone" class="anchored"><code>ui.display_timezone</code></div></td><td>enumeration</td><td><code>etc/utc</code></td><td>the timezone used to format timestamps in the ui. This setting is deprecatedand will be removed in a future version. Use the &#39;ui.default_timezone&#39; setting instead. &#39;ui.default_timezone&#39; takes precedence over this setting. [etc/utc = 0, america/new_york = 1]</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
-<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000025.2-upgrading-to-1000025.3-step-010</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
+<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000025.3-upgrading-to-1000025.4-step-002</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td><td>Serverless/Dedicated/Self-Hosted</td></tr>
 </tbody>
 </table>

pkg/BUILD.bazel

@@ -600,6 +600,7 @@ ALL_TESTS = [
     "//pkg/sql/schemachanger/scplan/internal/opgen:opgen_test",
     "//pkg/sql/schemachanger/scplan/internal/rules/current:current_test",
     "//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2_test",
+    "//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3_test",
     "//pkg/sql/schemachanger/scplan/internal/scgraph:scgraph_test",
     "//pkg/sql/schemachanger/scplan:scplan_test",
     "//pkg/sql/schemachanger/screl:screl_test",
@@ -2245,6 +2246,8 @@ GO_TARGETS = [
     "//pkg/sql/schemachanger/scplan/internal/rules/current:current_test",
     "//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2",
     "//pkg/sql/schemachanger/scplan/internal/rules/release_25_2:release_25_2_test",
+    "//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3",
+    "//pkg/sql/schemachanger/scplan/internal/rules/release_25_3:release_25_3_test",
     "//pkg/sql/schemachanger/scplan/internal/rules:rules",
     "//pkg/sql/schemachanger/scplan/internal/scgraph:scgraph",
     "//pkg/sql/schemachanger/scplan/internal/scgraph:scgraph_test",

pkg/build/version.txt

@@ -1 +1 @@
-v25.3.0-alpha.4
+v25.4.0-alpha.00000000

pkg/ccl/logictestccl/testdata/logic_test/crdb_internal_tenant

@@ -304,7 +304,7 @@ select crdb_internal.get_vmodule()
 query T
 SELECT crdb_internal.release_series(crdb_internal.node_executable_version())
 ----
-25.3
+25.4
 
 query ITTT colnames,rowsort
 select node_id, component, field, regexp_replace(regexp_replace(value, '^\d+$', '<port>'), e':\\d+', ':<port>') as value from crdb_internal.node_runtime_info
@@ -392,7 +392,7 @@ select * from crdb_internal.gossip_alerts
 query T
 SELECT crdb_internal.release_series(crdb_internal.node_executable_version())
 ----
-25.3
+25.4
 
 user root
 

pkg/cli/testdata/declarative-rules/invalid_version

@@ -5,3 +5,4 @@ debug declarative-print-rules 1.1 op
 unsupported version number, the supported versions are: 
  latest
  1000025.2
+ 1000025.3

pkg/clusterversion/cockroach_versions.go

@@ -226,6 +226,11 @@ const (
 	// constructing the split write batch.
 	V25_3_WriteInitialTruncStateBeforeSplitApplication
 
+	// V25_3 is CockroachDB v25.3. It's used for all v25.3.x patch releases.
+	V25_3
+
+	V25_4_Start
+
 	// *************************************************
 	// Step (1) Add new versions above this comment.
 	// Do not add new versions to a patch release.
@@ -278,6 +283,7 @@ var versionTable = [numKeys]roachpb.Version{
 
 	V25_2: {Major: 25, Minor: 2, Internal: 0},
 
+	// v25.3 versions. Internal versions must be even.
 	V25_3_Start: {Major: 25, Minor: 2, Internal: 2},
 
 	V25_3_AddEventLogColumnAndIndex: {Major: 25, Minor: 2, Internal: 4},
@@ -288,6 +294,10 @@ var versionTable = [numKeys]roachpb.Version{
 
 	V25_3_WriteInitialTruncStateBeforeSplitApplication: {Major: 25, Minor: 2, Internal: 10},
 
+	V25_3: {Major: 25, Minor: 3, Internal: 0},
+
+	// v25.4 versions. Internal versions must be even.
+	V25_4_Start: {Major: 25, Minor: 3, Internal: 2},
 	// *************************************************
 	// Step (2): Add new versions above this comment.
 	// Do not add new versions to a patch release.
@@ -305,13 +315,13 @@ const MinSupported Key = V25_2
 // have at least an RC build published).
 const PreviousRelease Key = V25_2
 
-// V25_3 is a placeholder that will eventually be replaced by the actual 25.3
+// V25_4 is a placeholder that will eventually be replaced by the actual 25.4
 // version Key, but in the meantime it points to the latest Key. The placeholder
 // is defined so that it can be referenced in code that simply wants to check if
-// a cluster is running 25.3 and has completed all associated migrations; most
+// a cluster is running 25.4 and has completed all associated migrations; most
 // version gates can use this instead of defining their own version key if they
-// only need to check that the cluster has upgraded to 25.3.
-const V25_3 = Latest
+// only need to check that the cluster has upgraded to 25.4.
+const V25_4 = Latest
 
 // DevelopmentBranch must be true on the main development branch but should be
 // set to false on a release branch once the set of versions becomes append-only

pkg/roachpb/version.go

@@ -238,6 +238,7 @@ var successorSeries = map[ReleaseSeries]ReleaseSeries{
 	{24, 3}: {25, 1},
 	{25, 1}: {25, 2},
 	{25, 2}: {25, 3},
+	{25, 3}: {25, 4},
 }
 
 // ReleaseSeries obtains the release series for the given version. Specifically:

pkg/roachpb/version_test.go

@@ -93,7 +93,7 @@ func TestReleaseSeriesSuccessor(t *testing.T) {
 	for ok := true; ok; r, ok = r.Successor() {
 		seq = append(seq, r.String())
 	}
-	expected := "20.1, 20.2, 21.1, 21.2, 22.1, 22.2, 23.1, 23.2, 24.1, 24.2, 24.3, 25.1, 25.2, 25.3"
+	expected := "20.1, 20.2, 21.1, 21.2, 22.1, 22.2, 23.1, 23.2, 24.1, 24.2, 24.3, 25.1, 25.2, 25.3, 25.4"
 	require.Equal(t, expected, strings.Join(seq, ", "))
 }
 

pkg/sql/catalog/bootstrap/testdata/testdata

@@ -1,7 +1,7 @@
-system hash=9bd6865c835ea9b64bbf5292e9d9e002f8e4a4a04c5d921455cbc1f273a4362d
+system hash=ffb0e135b967cb818044d8fd2534bcfe7cdf5273056307e41e4570b8ae009709
 ----
 [{"key":"8b"}
-,{"key":"8b89898a89","value":"0312470a0673797374656d10011a250a0d0a0561646d696e1080101880100a0c0a04726f6f7410801018801012046e6f646518032200280140004a006a0a08d9843d1002180020087000"}
+,{"key":"8b89898a89","value":"0312470a0673797374656d10011a250a0d0a0561646d696e1080101880100a0c0a04726f6f7410801018801012046e6f646518032200280140004a006a0a08d9843d1003180020027000"}
 ,{"key":"8b898b8a89","value":"030aa4030a0a64657363726970746f721803200128013a0042290a02696410011a0e0801104018002a003000501460002000300068007000780080010088010098010042310a0a64657363726970746f7210021a0e0808100018002a0030005011600020013000680070007800800100880100980100480352740a077072696d61727910011801220269642a0a64657363726970746f72300140004a10080010001a00200028003000380040005a0070027a0408002000800100880100900104980101a20106080012001800a80100b20100ba0100c00100c80100d00101e00100e9010000000000000000f2010060026a210a0b0a0561646d696e102018200a0a0a04726f6f741020182012046e6f64651803800101880103980100b201130a077072696d61727910001a02696420012800b201240a1066616d5f325f64657363726970746f7210021a0a64657363726970746f7220022802b80103c20100e80100f2010408001200f801008002009202009a0200b20200b80200c0021dc80200e00200800300880302a80300b00300d00300d80300e00300f80300880400980400a00400a80400"}
 ,{"key":"8b898c8a89","value":"030a89070a0575736572731804200128013a00422f0a08757365726e616d6510011a0e0807100018002a003000501960002000300068007000780080010088010098010042350a0e68617368656450617373776f726410021a0e0808100018002a003000501160002001300068007000780080010088010098010042340a066973526f6c6510031a0e0800100018002a0030005010600020002a0566616c73653000680070007800800100880100980100422e0a07757365725f696410041a0e080c100018002a003000501a60002000300068007000780080010088010098010042410a19657374696d617465645f6c6173745f6c6f67696e5f74696d6510051a0f0809100018002a00300050a009600020013000680070007800800100880100980100480652b0010a077072696d617279100118012208757365726e616d652a0e68617368656450617373776f72642a066973526f6c652a07757365725f69642a19657374696d617465645f6c6173745f6c6f67696e5f74696d65300140004a10080010001a00200028003000380040005a0070027003700470057a0408002000800100880100900104980101a20106080012001800a80100b20100ba0100c00100c80100d00102e00100e9010000000000000000f201005a770a1175736572735f757365725f69645f696478100218012207757365725f69643004380140004a10080010001a00200028003000380040005a007a0408002000800100880100900103980100a20106080012001800a80100b20100ba0100c00100c80100d00101e00100e9010000000000000000f2010060036a250a0d0a0561646d696e10e00318e0030a0c0a04726f6f7410e00318e00312046e6f64651803800101880103980100b201240a077072696d61727910001a08757365726e616d651a07757365725f6964200120042804b2012c0a1466616d5f325f68617368656450617373776f726410021a0e68617368656450617373776f726420022802b2011c0a0c66616d5f335f6973526f6c6510031a066973526f6c6520032803b201420a1f66616d5f355f657374696d617465645f6c6173745f6c6f67696e5f74696d6510051a19657374696d617465645f6c6173745f6c6f67696e5f74696d6520052805b80106c20100e80100f2010408001200f801008002009202009a0200b20200b80200c0021dc80200e00200800300880303a80300b00300d00300d80300e00300f80300880400980400a00400a80400"}
 ,{"key":"8b898d8a89","value":"030a93030a057a6f6e65731805200128013a0042290a02696410011a0e0801104018002a0030005014600020003000680070007800800100880100980100422d0a06636f6e66696710021a0e0808100018002a0030005011600020013000680070007800800100880100980100480352700a077072696d61727910011801220269642a06636f6e666967300140004a10080010001a00200028003000380040005a0070027a0408002000800100880100900104980101a20106080012001800a80100b20100ba0100c00100c80100d00101e00100e9010000000000000000f2010060026a250a0d0a0561646d696e10e00318e0030a0c0a04726f6f7410e00318e00312046e6f64651803800101880103980100b201130a077072696d61727910001a02696420012800b2011c0a0c66616d5f325f636f6e66696710021a06636f6e66696720022802b80103c20100e80100f2010408001200f801008002009202009a0200b20200b80200c0021dc80200e00200800300880302a80300b00300d00300d80300e00300f80300880400980400a00400a80400"}
@@ -213,10 +213,10 @@ system hash=9bd6865c835ea9b64bbf5292e9d9e002f8e4a4a04c5d921455cbc1f273a4362d
 ,{"key":"d0"}
 ]
 
-tenant hash=6880b438cb1cbcdd35679d8d35902d5dc5d7c2f53e0ef72294fe5c4500bcfb0d
+tenant hash=a583db8aa034c366dcafb856d23ec046f3b258fcf7acbb637d4dc2a5dda3132c
 ----
 [{"key":""}
-,{"key":"8b89898a89","value":"0312470a0673797374656d10011a250a0d0a0561646d696e1080101880100a0c0a04726f6f7410801018801012046e6f646518032200280140004a006a0a08d9843d1002180020087000"}
+,{"key":"8b89898a89","value":"0312470a0673797374656d10011a250a0d0a0561646d696e1080101880100a0c0a04726f6f7410801018801012046e6f646518032200280140004a006a0a08d9843d1003180020027000"}
 ,{"key":"8b898b8a89","value":"030aa4030a0a64657363726970746f721803200128013a0042290a02696410011a0e0801104018002a003000501460002000300068007000780080010088010098010042310a0a64657363726970746f7210021a0e0808100018002a0030005011600020013000680070007800800100880100980100480352740a077072696d61727910011801220269642a0a64657363726970746f72300140004a10080010001a00200028003000380040005a0070027a0408002000800100880100900104980101a20106080012001800a80100b20100ba0100c00100c80100d00101e00100e9010000000000000000f2010060026a210a0b0a0561646d696e102018200a0a0a04726f6f741020182012046e6f64651803800101880103980100b201130a077072696d61727910001a02696420012800b201240a1066616d5f325f64657363726970746f7210021a0a64657363726970746f7220022802b80103c20100e80100f2010408001200f801008002009202009a0200b20200b80200c0021dc80200e00200800300880302a80300b00300d00300d80300e00300f80300880400980400a00400a80400"}
 ,{"key":"8b898c8a89","value":"030a89070a0575736572731804200128013a00422f0a08757365726e616d6510011a0e0807100018002a003000501960002000300068007000780080010088010098010042350a0e68617368656450617373776f726410021a0e0808100018002a003000501160002001300068007000780080010088010098010042340a066973526f6c6510031a0e0800100018002a0030005010600020002a0566616c73653000680070007800800100880100980100422e0a07757365725f696410041a0e080c100018002a003000501a60002000300068007000780080010088010098010042410a19657374696d617465645f6c6173745f6c6f67696e5f74696d6510051a0f0809100018002a00300050a009600020013000680070007800800100880100980100480652b0010a077072696d617279100118012208757365726e616d652a0e68617368656450617373776f72642a066973526f6c652a07757365725f69642a19657374696d617465645f6c6173745f6c6f67696e5f74696d65300140004a10080010001a00200028003000380040005a0070027003700470057a0408002000800100880100900104980101a20106080012001800a80100b20100ba0100c00100c80100d00102e00100e9010000000000000000f201005a770a1175736572735f757365725f69645f696478100218012207757365725f69643004380140004a10080010001a00200028003000380040005a007a0408002000800100880100900103980100a20106080012001800a80100b20100ba0100c00100c80100d00101e00100e9010000000000000000f2010060036a250a0d0a0561646d696e10e00318e0030a0c0a04726f6f7410e00318e00312046e6f64651803800101880103980100b201240a077072696d61727910001a08757365726e616d651a07757365725f6964200120042804b2012c0a1466616d5f325f68617368656450617373776f726410021a0e68617368656450617373776f726420022802b2011c0a0c66616d5f335f6973526f6c6510031a066973526f6c6520032803b201420a1f66616d5f355f657374696d617465645f6c6173745f6c6f67696e5f74696d6510051a19657374696d617465645f6c6173745f6c6f67696e5f74696d6520052805b80106c20100e80100f2010408001200f801008002009202009a0200b20200b80200c0021dc80200e00200800300880303a80300b00300d00300d80300e00300f80300880400980400a00400a80400"}
 ,{"key":"8b898d8a89","value":"030a93030a057a6f6e65731805200128013a0042290a02696410011a0e0801104018002a0030005014600020003000680070007800800100880100980100422d0a06636f6e66696710021a0e0808100018002a0030005011600020013000680070007800800100880100980100480352700a077072696d61727910011801220269642a06636f6e666967300140004a10080010001a00200028003000380040005a0070027a0408002000800100880100900104980101a20106080012001800a80100b20100ba0100c00100c80100d00101e00100e9010000000000000000f2010060026a250a0d0a0561646d696e10e00318e0030a0c0a04726f6f7410e00318e00312046e6f64651803800101880103980100b201130a077072696d61727910001a02696420012800b2011c0a0c66616d5f325f636f6e66696710021a06636f6e66696720022802b80103c20100e80100f2010408001200f801008002009202009a0200b20200b80200c0021dc80200e00200800300880302a80300b00300d00300d80300e00300f80300880400980400a00400a80400"}