Skip to content

Commit

Permalink
clusterversion: create 25.1 version
Browse files Browse the repository at this point in the history
This change bumps the version on master to 25.1 without advancing the
previous release to 24.3 (the latter can only be done once we have a
published RC, or upgrade tests will fail). To allow this decoupling, a
few minor tweaks were needed (to `SupportedPreviousReleases` and to
the tool that generates the releases file.

Also made some minor improvements to the runbook and
sql-bootstrap-data. I will do a more thorough change to the runbook
that separates this step.

- [x] Add version key constant for new release, equal to `Latest`
- [x] Update `PreviousRelease` constant
- [x] Add start version
- [x] Update `pkg/build/version.txt` to the new version
- [x] Add mixed version logictest config for the replaced version
- [x] Update the `scplan` rules in `pkg/sql/schemachanger/scplan/internal/rules` (already done)
- [x] Create new SQL bootstrap data
- [x] Update releases file

Epic: REL-1322
  • Loading branch information
RaduBerinde committed Nov 15, 2024
1 parent 39e43b8 commit 9da6128
Show file tree
Hide file tree
Showing 41 changed files with 5,415 additions and 414 deletions.
2 changes: 1 addition & 1 deletion docs/generated/settings/settings-for-tenants.txt
Original file line number Diff line number Diff line change
Expand Up @@ -402,4 +402,4 @@ trace.span_registry.enabled boolean true if set, ongoing traces can be seen at h
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. application
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.display_timezone enumeration etc/utc the timezone used to format timestamps in the ui [etc/utc = 0, america/new_york = 1] application
version version 1000024.2-upgrading-to-1000024.3-step-022 set the active cluster version in the format '<major>.<minor>' application
version version 1000024.3-upgrading-to-1000025.1-step-002 set the active cluster version in the format '<major>.<minor>' application
2 changes: 1 addition & 1 deletion docs/generated/settings/settings.html
Original file line number Diff line number Diff line change
Expand Up @@ -360,6 +360,6 @@
<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><td>Serverless/Dedicated/Self-Hosted</td></tr>
<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-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 [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>1000024.2-upgrading-to-1000024.3-step-022</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>1000024.3-upgrading-to-1000025.1-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>
8 changes: 8 additions & 0 deletions pkg/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ ALL_TESTS = [
"//pkg/ccl/logictestccl/tests/fakedist:fakedist_test",
"//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
"//pkg/ccl/logictestccl/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/ccl/logictestccl/tests/local-mixed-24.3:local-mixed-24_3_test",
"//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
"//pkg/ccl/logictestccl/tests/local-repeatable-read:local-repeatable-read_test",
"//pkg/ccl/logictestccl/tests/local-vec-off:local-vec-off_test",
Expand Down Expand Up @@ -486,6 +487,7 @@ ALL_TESTS = [
"//pkg/sql/logictest/tests/fakedist:fakedist_test",
"//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
"//pkg/sql/logictest/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/sql/logictest/tests/local-mixed-24.3:local-mixed-24_3_test",
"//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
"//pkg/sql/logictest/tests/local:local_test",
"//pkg/sql/logictest/tests/multiregion-9node-3region-3azs:multiregion-9node-3region-3azs_test",
Expand All @@ -503,6 +505,7 @@ ALL_TESTS = [
"//pkg/sql/opt/exec/execbuilder/tests/fakedist:fakedist_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-24.3:local-mixed-24_3_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-vec-off:local-vec-off_test",
"//pkg/sql/opt/exec/execbuilder/tests/local:local_test",
"//pkg/sql/opt/exec/execbuilder:execbuilder_test",
Expand Down Expand Up @@ -605,6 +608,7 @@ ALL_TESTS = [
"//pkg/sql/sqlitelogictest/tests/fakedist:fakedist_test",
"//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
"//pkg/sql/sqlitelogictest/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/sql/sqlitelogictest/tests/local-mixed-24.3:local-mixed-24_3_test",
"//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",
"//pkg/sql/sqlitelogictest/tests/local-repeatable-read:local-repeatable-read_test",
"//pkg/sql/sqlitelogictest/tests/local-vec-off:local-vec-off_test",
Expand Down Expand Up @@ -931,6 +935,7 @@ GO_TARGETS = [
"//pkg/ccl/logictestccl/tests/fakedist:fakedist_test",
"//pkg/ccl/logictestccl/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
"//pkg/ccl/logictestccl/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/ccl/logictestccl/tests/local-mixed-24.3:local-mixed-24_3_test",
"//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
"//pkg/ccl/logictestccl/tests/local-repeatable-read:local-repeatable-read_test",
"//pkg/ccl/logictestccl/tests/local-vec-off:local-vec-off_test",
Expand Down Expand Up @@ -1962,6 +1967,7 @@ GO_TARGETS = [
"//pkg/sql/logictest/tests/fakedist:fakedist_test",
"//pkg/sql/logictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
"//pkg/sql/logictest/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/sql/logictest/tests/local-mixed-24.3:local-mixed-24_3_test",
"//pkg/sql/logictest/tests/local-vec-off:local-vec-off_test",
"//pkg/sql/logictest/tests/local:local_test",
"//pkg/sql/logictest/tests/multiregion-9node-3region-3azs:multiregion-9node-3region-3azs_test",
Expand All @@ -1988,6 +1994,7 @@ GO_TARGETS = [
"//pkg/sql/opt/exec/execbuilder/tests/fakedist:fakedist_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-24.3:local-mixed-24_3_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-vec-off:local-vec-off_test",
"//pkg/sql/opt/exec/execbuilder/tests/local:local_test",
"//pkg/sql/opt/exec/execbuilder:execbuilder",
Expand Down Expand Up @@ -2237,6 +2244,7 @@ GO_TARGETS = [
"//pkg/sql/sqlitelogictest/tests/fakedist:fakedist_test",
"//pkg/sql/sqlitelogictest/tests/local-legacy-schema-changer:local-legacy-schema-changer_test",
"//pkg/sql/sqlitelogictest/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/sql/sqlitelogictest/tests/local-mixed-24.3:local-mixed-24_3_test",
"//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",
"//pkg/sql/sqlitelogictest/tests/local-repeatable-read:local-repeatable-read_test",
"//pkg/sql/sqlitelogictest/tests/local-vec-off:local-vec-off_test",
Expand Down
2 changes: 1 addition & 1 deletion pkg/build/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v24.3.0-alpha.3
v25.1.0-alpha.00000000
4 changes: 2 additions & 2 deletions pkg/ccl/logictestccl/testdata/logic_test/crdb_internal_tenant
Original file line number Diff line number Diff line change
Expand Up @@ -413,7 +413,7 @@ select crdb_internal.get_vmodule()
query T
SELECT crdb_internal.release_series(crdb_internal.node_executable_version())
----
24.3
25.1

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
Expand Down Expand Up @@ -501,7 +501,7 @@ select * from crdb_internal.gossip_alerts
query T
SELECT crdb_internal.release_series(crdb_internal.node_executable_version())
----
24.3
25.1

user root

Expand Down
28 changes: 28 additions & 0 deletions pkg/ccl/logictestccl/tests/local-mixed-24.3/BUILD.bazel
Original file line number Diff line number Diff line change
@@ -0,0 +1,28 @@
load("@io_bazel_rules_go//go:def.bzl", "go_test")

go_test(
name = "local-mixed-24_3_test",
size = "enormous",
srcs = ["generated_test.go"],
data = [
"//c-deps:libgeos", # keep
"//pkg/ccl/logictestccl:testdata", # keep
],
exec_properties = {"test.Pool": "large"},
shard_count = 31,
tags = ["cpu:1"],
deps = [
"//pkg/base",
"//pkg/build/bazel",
"//pkg/ccl",
"//pkg/security/securityassets",
"//pkg/security/securitytest",
"//pkg/server",
"//pkg/sql/logictest",
"//pkg/testutils/serverutils",
"//pkg/testutils/skip",
"//pkg/testutils/testcluster",
"//pkg/util/leaktest",
"//pkg/util/randutil",
],
)
Loading

0 comments on commit 9da6128

Please sign in to comment.