Skip to content

Commit

Permalink
clusterversion: create 24.3 version
Browse files Browse the repository at this point in the history
- [x] Add version key constant for new release (e.g. `V24.2`), equal to `Latest`
- [x] Update `PreviousRelease` constant
- [x] Add start version (e.g. `V24.2Start` with version `24.1-2`)
- [x] Update `pkg/build/version.txt` to the new version (e.g. `v24.2.0-alpha.00000000`)
- [x] Add mixed version logictest config for the replaced version
- [x] Update the `scplan` rules in `pkg/sql/schemachanger/scplan/internal/rules`
- [x] Create new roachtest fixtures for the previous version
- [x] Create new SQL bootstrap data
- [x] Update releases file

This change does not update the version skipping logic; in a follow-up
change we will enable direct 24.1->24.3 upgrade without a special env
flag.

Epic: REL-1163
Release note: None
  • Loading branch information
RaduBerinde committed Aug 12, 2024
1 parent 5e6a854 commit 9e03322
Show file tree
Hide file tree
Showing 54 changed files with 5,248 additions and 311 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 @@ -392,4 +392,4 @@ trace.snapshot.rate duration 0s if non-zero, interval at which background trace
trace.span_registry.enabled boolean true if set, ongoing traces can be seen at https://<ui>/#/debug/tracez application
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.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.1-upgrading-to-1000024.2-step-012 set the active cluster version in the format '<major>.<minor>' application
version version 1000024.2-upgrading-to-1000024.3-step-004 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 @@ -347,6 +347,6 @@
<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><td>Serverless/Dedicated/Self-Hosted</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><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.1-upgrading-to-1000024.2-step-012</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.2-upgrading-to-1000024.3-step-004</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 @@ -62,6 +62,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.1:local-mixed-24_1_test",
"//pkg/ccl/logictestccl/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
"//pkg/ccl/logictestccl/tests/local-vec-off:local-vec-off_test",
"//pkg/ccl/logictestccl/tests/local:local_test",
Expand Down Expand Up @@ -483,6 +484,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.1:local-mixed-24_1_test",
"//pkg/sql/logictest/tests/local-mixed-24.2:local-mixed-24_2_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 @@ -500,6 +502,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.1:local-mixed-24_1_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-24.2:local-mixed-24_2_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 @@ -601,6 +604,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.1:local-mixed-24_1_test",
"//pkg/sql/sqlitelogictest/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",
"//pkg/sql/sqlitelogictest/tests/local-vec-off:local-vec-off_test",
"//pkg/sql/sqlitelogictest/tests/local:local_test",
Expand Down Expand Up @@ -918,6 +922,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.1:local-mixed-24_1_test",
"//pkg/ccl/logictestccl/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/ccl/logictestccl/tests/local-read-committed:local-read-committed_test",
"//pkg/ccl/logictestccl/tests/local-vec-off:local-vec-off_test",
"//pkg/ccl/logictestccl/tests/local:local_test",
Expand Down Expand Up @@ -1947,6 +1952,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.1:local-mixed-24_1_test",
"//pkg/sql/logictest/tests/local-mixed-24.2:local-mixed-24_2_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 @@ -1973,6 +1979,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.1:local-mixed-24_1_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-24.2:local-mixed-24_2_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 @@ -2222,6 +2229,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.1:local-mixed-24_1_test",
"//pkg/sql/sqlitelogictest/tests/local-mixed-24.2:local-mixed-24_2_test",
"//pkg/sql/sqlitelogictest/tests/local-read-committed:local-read-committed_test",
"//pkg/sql/sqlitelogictest/tests/local-vec-off:local-vec-off_test",
"//pkg/sql/sqlitelogictest/tests/local:local_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.2.0-alpha.2
v24.3.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 @@ -406,7 +406,7 @@ select crdb_internal.get_vmodule()
query T
SELECT crdb_internal.release_series(crdb_internal.node_executable_version())
----
24.2
24.3

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 @@ -494,7 +494,7 @@ select * from crdb_internal.gossip_alerts
query T
SELECT crdb_internal.release_series(crdb_internal.node_executable_version())
----
24.2
24.3

user root

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,7 @@ upgrade 0
query T nodeidx=0
SELECT crdb_internal.release_series(crdb_internal.node_executable_version())
----
24.2
24.3

statement error pg_vector not supported until version 24.2
CREATE TABLE t (v VECTOR(1))
Expand All @@ -44,12 +44,12 @@ SET CLUSTER SETTING version = crdb_internal.node_executable_version();
query T nodeidx=1
SELECT crdb_internal.release_series(crdb_internal.node_executable_version())
----
24.2
24.3

query T nodeidx=2
SELECT crdb_internal.release_series(crdb_internal.node_executable_version())
----
24.2
24.3

query B retry
SELECT crdb_internal.is_at_least_version('24.1-02')
Expand Down

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

28 changes: 28 additions & 0 deletions pkg/ccl/logictestccl/tests/local-mixed-24.2/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_2_test",
size = "enormous",
srcs = ["generated_test.go"],
data = [
"//c-deps:libgeos", # keep
"//pkg/ccl/logictestccl:testdata", # keep
],
exec_properties = {"test.Pool": "large"},
shard_count = 30,
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 9e03322

Please sign in to comment.