Merge cockroachdb#99128

99128: clusterversion: prep 23.1 release branch and initialize 23.2 development r=celiala a=celiala As part of the 23.1 stability period tasks, this PR preps the 23.1 release branch and initializes 23.2 development, as per this release runbook: [Prep Release and Define Start of Development for Next Release](https://cockroachlabs.atlassian.net/wiki/spaces/RE/pages/2924740768/Prep+Release+and+Define+Start+of+Development+for+Next+Release). This PR will contain 4 commits: |commit|backported when| |-|-| |1. Set developmentBranch to false|soon after branch cut / before selecting beta.1 candidate| |2. Update version.txt to alpha.8 (next release)|soon after branch cut / before selecting ~beta.1~ this week's alpha.8 candidate| |3. Mint the previous release|should be final backport before the final RC / before selecting final RC candidate| |4. Define the start of 23.2 development and placeholder key|_(not backported)_| Release note: none. Epic: REL-283 Co-authored-by: Celia La <[email protected]>
jayshrivastava · Mar 23, 2023 · 8d534b8 · 8d534b8
2 parents 591dda2 + df0f96c
commit 8d534b8
Show file tree

Hide file tree

Showing 10 changed files with 37 additions and 22 deletions.
diff --git a/docs/generated/settings/settings-for-tenants.txt b/docs/generated/settings/settings-for-tenants.txt
@@ -289,4 +289,4 @@ trace.opentelemetry.collector	string		address of an OpenTelemetry trace collecto
 trace.snapshot.rate	duration	0s	if non-zero, interval at which background trace snapshots are captured
 trace.span_registry.enabled	boolean	true	if set, ongoing traces can be seen at https://<ui>/#/debug/tracez
 trace.zipkin.collector	string		the address of a Zipkin instance to receive traces, as <host>:<port>. If no port is specified, 9411 will be used.
-version	version	1000022.2-94	set the active cluster version in the format '<major>.<minor>'
+version	version	1000023.1-2	set the active cluster version in the format '<major>.<minor>'
diff --git a/docs/generated/settings/settings.html b/docs/generated/settings/settings.html
@@ -241,6 +241,6 @@
 <tr><td><div id="setting-trace-snapshot-rate" class="anchored"><code>trace.snapshot.rate</code></div></td><td>duration</td><td><code>0s</code></td><td>if non-zero, interval at which background trace snapshots are captured</td></tr>
 <tr><td><div id="setting-trace-span-registry-enabled" class="anchored"><code>trace.span_registry.enabled</code></div></td><td>boolean</td><td><code>true</code></td><td>if set, ongoing traces can be seen at https://&lt;ui&gt;/#/debug/tracez</td></tr>
 <tr><td><div id="setting-trace-zipkin-collector" class="anchored"><code>trace.zipkin.collector</code></div></td><td>string</td><td><code></code></td><td>the address of a Zipkin instance to receive traces, as &lt;host&gt;:&lt;port&gt;. If no port is specified, 9411 will be used.</td></tr>
-<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000022.2-94</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td></tr>
+<tr><td><div id="setting-version" class="anchored"><code>version</code></div></td><td>version</td><td><code>1000023.1-2</code></td><td>set the active cluster version in the format &#39;&lt;major&gt;.&lt;minor&gt;&#39;</td></tr>
 </tbody>
 </table>
diff --git a/pkg/build/version.txt b/pkg/build/version.txt
@@ -1 +1 @@
-v23.1.0-alpha.7
+v23.1.0-alpha.8
diff --git a/pkg/ccl/logictestccl/testdata/logic_test/crdb_internal_tenant b/pkg/ccl/logictestccl/testdata/logic_test/crdb_internal_tenant
@@ -387,7 +387,7 @@ select crdb_internal.get_vmodule()
 query T
 select regexp_replace(regexp_replace(crdb_internal.node_executable_version()::string, '(-\d+)?$', ''), '10000', '');
 ----
-22.2
+23.1
 
 query ITTT colnames
 select node_id, component, field, regexp_replace(regexp_replace(value, '^\d+$', '<port>'), e':\\d+', ':<port>') as value from crdb_internal.node_runtime_info
@@ -480,7 +480,7 @@ select * from crdb_internal.gossip_alerts
 query T
 select regexp_replace(regexp_replace(crdb_internal.node_executable_version()::string, '(-\d+)?$', ''), '10000', '');
 ----
-22.2
+23.1
 
 user root
 

diff --git a/pkg/cli/testdata/declarative-rules/deprules b/pkg/cli/testdata/declarative-rules/deprules
@@ -1,6 +1,6 @@
 dep
 ----
-debug declarative-print-rules 1000022.2-94 dep
+debug declarative-print-rules 1000023.1-2 dep
 deprules
 ----
 - name: 'CheckConstraint transitions to ABSENT uphold 2-version invariant: PUBLIC->VALIDATED'

diff --git a/pkg/cli/testdata/declarative-rules/oprules b/pkg/cli/testdata/declarative-rules/oprules
@@ -1,6 +1,6 @@
 op
 ----
-debug declarative-print-rules 1000022.2-94 op
+debug declarative-print-rules 1000023.1-2 op
 rules
 ----
 []
diff --git a/pkg/clusterversion/cockroach_versions.go b/pkg/clusterversion/cockroach_versions.go
@@ -510,6 +510,13 @@ const (
 	// that are optimized for the console.
 	V23_1AddSystemActivityTables
 
+	// V23_1 is CockroachDB v23.1. It's used for all v23.1.x patch releases.
+	V23_1
+
+	// V23_2_Start demarcates the start of cluster versions stepped through during
+	// the process of upgrading from previous supported releases to 23.2.
+	V23_2Start
+
 	// *************************************************
 	// Step (1): Add new versions here.
 	// Do not add new versions to a patch release.
@@ -883,6 +890,14 @@ var rawVersionsSingleton = keyedVersions{
 		Key:     V23_1AddSystemActivityTables,
 		Version: roachpb.Version{Major: 22, Minor: 2, Internal: 94},
 	},
+	{
+		Key:     V23_1,
+		Version: roachpb.Version{Major: 23, Minor: 1, Internal: 0},
+	},
+	{
+		Key:     V23_2Start,
+		Version: roachpb.Version{Major: 23, Minor: 1, Internal: 2},
+	},
 
 	// *************************************************
 	// Step (2): Add new versions here.
@@ -952,13 +967,13 @@ var versionsSingleton = func() keyedVersions {
 	return rawVersionsSingleton
 }()
 
-// V23_1 is a placeholder that will eventually be replaced by the actual 23.1
+// V23_2 is a placeholder that will eventually be replaced by the actual 23.2
 // 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 23.1 and has completed all associated migrations; most
+// a cluster is running 23.2 and has completed all associated migrations; most
 // version gates can use this instead of defining their own version key if all
-// simply need to check is that the cluster has upgraded to 23.1.
-var V23_1 = versionsSingleton[len(versionsSingleton)-1].Key
+// simply need to check is that the cluster has upgraded to 23.2.
+var V23_2 = versionsSingleton[len(versionsSingleton)-1].Key
 
 const (
 	BinaryMinSupportedVersionKey = V22_2
@@ -975,7 +990,7 @@ var (
 	// comment).
 	binaryMinSupportedVersion = ByKey(BinaryMinSupportedVersionKey)
 
-	BinaryVersionKey = V23_1
+	BinaryVersionKey = V23_2
 	// binaryVersion is the version of this binary.
 	//
 	// This is the version that a new cluster will use when created.

diff --git a/pkg/sql/logictest/testdata/logic_test/crdb_internal b/pkg/sql/logictest/testdata/logic_test/crdb_internal
@@ -560,7 +560,7 @@ select crdb_internal.get_vmodule()
 query T
 select regexp_replace(crdb_internal.node_executable_version()::string, '(-\d+)?$', '');
 ----
-1000022.2
+1000023.1
 
 query ITTT colnames
 select node_id, component, field, regexp_replace(regexp_replace(value, '^\d+$', '<port>'), e':\\d+', ':<port>') as value from crdb_internal.node_runtime_info
@@ -714,7 +714,7 @@ SELECT * FROM crdb_internal.check_consistency(true, b'\x02', b'\x04')
 query T
 select regexp_replace(crdb_internal.node_executable_version()::string, '(-\d+)?$', '');
 ----
-1000022.2
+1000023.1
 
 user root
 

diff --git a/pkg/sql/logictest/testdata/logic_test/mixed_version_can_login b/pkg/sql/logictest/testdata/logic_test/mixed_version_can_login
@@ -21,7 +21,7 @@ SELECT crdb_internal.create_tenant(1001)
 upgrade 1
 
 query B
-SELECT crdb_internal.node_executable_version() SIMILAR TO '1000022.2-%'
+SELECT crdb_internal.node_executable_version() SIMILAR TO '1000023.1-%'
 ----
 true
 
@@ -34,15 +34,15 @@ SELECT crdb_internal.node_executable_version()
 user testuser nodeidx=0
 
 query B
-SELECT crdb_internal.node_executable_version() SIMILAR TO '1000022.2-%'
+SELECT crdb_internal.node_executable_version() SIMILAR TO '1000023.1-%'
 ----
 true
 
 # Verify that a root user can login on the upgraded node.
 user root nodeidx=1
 
 query B
-SELECT crdb_internal.node_executable_version() SIMILAR TO '1000022.2-%'
+SELECT crdb_internal.node_executable_version() SIMILAR TO '1000023.1-%'
 ----
 true
 
@@ -65,7 +65,7 @@ SELECT crdb_internal.node_executable_version()
 upgrade 2
 
 query B
-SELECT crdb_internal.node_executable_version() SIMILAR TO '1000022.2-%'
+SELECT crdb_internal.node_executable_version() SIMILAR TO '1000023.1-%'
 ----
 true
 

diff --git a/pkg/sql/logictest/testdata/logic_test/mixed_version_role_members_user_ids b/pkg/sql/logictest/testdata/logic_test/mixed_version_role_members_user_ids
@@ -47,7 +47,7 @@ upgrade 1
 # Test that there are no problems creating role memberships on a mixed 22.2/23.1 cluster.
 
 query B nodeidx=1
-SELECT crdb_internal.node_executable_version() SIMILAR TO '1000022.2-%'
+SELECT crdb_internal.node_executable_version() SIMILAR TO '1000023.1-%'
 ----
 true
 
@@ -83,16 +83,16 @@ upgrade 2
 # Verify that all nodes are now running 23.1 binaries.
 
 query B nodeidx=0
-SELECT crdb_internal.node_executable_version() SIMILAR TO '1000022.2-%'
+SELECT crdb_internal.node_executable_version() SIMILAR TO '1000023.1-%'
 ----
 true
 
 query B nodeidx=1
-SELECT crdb_internal.node_executable_version() SIMILAR TO '1000022.2-%'
+SELECT crdb_internal.node_executable_version() SIMILAR TO '1000023.1-%'
 ----
 true
 
 query B nodeidx=2
-SELECT crdb_internal.node_executable_version() SIMILAR TO '1000022.2-%'
+SELECT crdb_internal.node_executable_version() SIMILAR TO '1000023.1-%'
 ----
 true