Skip to content

Commit

Permalink
clusterversion: bump version to 24.1
Browse files Browse the repository at this point in the history
This commit enacts the following steps:
 - add `V23_2` release version key
 - add `V24_1Start` version key
 - add `V24` version key alias
 - add `local-mixed-23.2` logictest config
 - create new bootstrap files (from the testdata), add to initial
   values map
 - update `pkg/build/version.txt` to `v24.1.0-alpha.00000000`
 - update releases file:
```
  bazel build //pkg/cmd/release:release
  _bazel/bin/pkg/cmd/release/release_/release update-releases-file
```

We also make a small cleanup change to remove
`firstUpgradesAfterPreExistingReleases` and instead use a helper
function for first upgrades (and check that all `Start` versions have
the expected description).

Epic: none
Release note: None
  • Loading branch information
RaduBerinde committed Oct 18, 2023
1 parent 90704d2 commit 722bf13
Show file tree
Hide file tree
Showing 38 changed files with 5,438 additions and 385 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 @@ -320,4 +320,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 1000023.1-38 set the active cluster version in the format '<major>.<minor>' application
version version 1000023.2-2 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 @@ -272,6 +272,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>1000023.1-38</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>1000023.2-2</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 @@ -52,6 +52,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-23.1:local-mixed-23_1_test",
"//pkg/ccl/logictestccl/tests/local-mixed-23.2:local-mixed-23_2_test",
"//pkg/ccl/logictestccl/tests/local-vec-off:local-vec-off_test",
"//pkg/ccl/logictestccl/tests/local:local_test",
"//pkg/ccl/logictestccl/tests/multiregion-15node-5region-3azs:multiregion-15node-5region-3azs_test",
Expand Down Expand Up @@ -453,6 +454,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-23.1:local-mixed-23_1_test",
"//pkg/sql/logictest/tests/local-mixed-23.2:local-mixed-23_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 @@ -470,6 +472,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-23.1:local-mixed-23_1_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-23.2:local-mixed-23_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 @@ -570,6 +573,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-23.1:local-mixed-23_1_test",
"//pkg/sql/sqlitelogictest/tests/local-mixed-23.2:local-mixed-23_2_test",
"//pkg/sql/sqlitelogictest/tests/local-vec-off:local-vec-off_test",
"//pkg/sql/sqlitelogictest/tests/local:local_test",
"//pkg/sql/sqlliveness/slinstance:slinstance_test",
Expand Down Expand Up @@ -857,6 +861,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-23.1:local-mixed-23_1_test",
"//pkg/ccl/logictestccl/tests/local-mixed-23.2:local-mixed-23_2_test",
"//pkg/ccl/logictestccl/tests/local-vec-off:local-vec-off_test",
"//pkg/ccl/logictestccl/tests/local:local_test",
"//pkg/ccl/logictestccl/tests/multiregion-15node-5region-3azs:multiregion-15node-5region-3azs_test",
Expand Down Expand Up @@ -1849,6 +1854,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-23.1:local-mixed-23_1_test",
"//pkg/sql/logictest/tests/local-mixed-23.2:local-mixed-23_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 @@ -1875,6 +1881,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-23.1:local-mixed-23_1_test",
"//pkg/sql/opt/exec/execbuilder/tests/local-mixed-23.2:local-mixed-23_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 @@ -2114,6 +2121,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-23.1:local-mixed-23_1_test",
"//pkg/sql/sqlitelogictest/tests/local-mixed-23.2:local-mixed-23_2_test",
"//pkg/sql/sqlitelogictest/tests/local-vec-off:local-vec-off_test",
"//pkg/sql/sqlitelogictest/tests/local:local_test",
"//pkg/sql/sqlitelogictest:sqlitelogictest",
Expand Down
2 changes: 1 addition & 1 deletion pkg/build/version.txt
Original file line number Diff line number Diff line change
@@ -1 +1 @@
v23.2.0-alpha.4
v24.1.0-alpha.00000000
6 changes: 4 additions & 2 deletions pkg/ccl/kvccl/kvtenantccl/upgradeccl/tenant_upgrade_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -405,7 +405,6 @@ func v0v1v2() (roachpb.Version, roachpb.Version, roachpb.Version) {
func TestTenantUpgradeFailure(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)
skip.WithIssue(t, 112209)

v0 := clusterversion.TestingBinaryMinSupportedVersion
v2 := clusterversion.TestingBinaryVersion
Expand All @@ -418,7 +417,10 @@ func TestTenantUpgradeFailure(t *testing.T) {
break
}
}
require.NotEqual(t, v1, roachpb.Version{})
if v1 == (roachpb.Version{}) {
// There is no in-between version supported; skip this test.
skip.IgnoreLint(t, "test can only run when we support two previous releases")
}

t.Log("starting server")
ctx := context.Background()
Expand Down
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 @@ -400,7 +400,7 @@ select crdb_internal.get_vmodule()
query T
select regexp_replace(regexp_replace(crdb_internal.node_executable_version()::string, '(-\d+)?$', ''), '10000', '');
----
23.1
23.2

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 @@ -490,7 +490,7 @@ select * from crdb_internal.gossip_alerts
query T
select regexp_replace(regexp_replace(crdb_internal.node_executable_version()::string, '(-\d+)?$', ''), '10000', '');
----
23.1
23.2

user root

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

go_test(
name = "local-mixed-23_2_test",
size = "enormous",
srcs = ["generated_test.go"],
args = select({
"//build/toolchains:use_ci_timeouts": ["-test.timeout=895s"],
"//conditions:default": ["-test.timeout=3595s"],
}),
data = [
"//c-deps:libgeos", # keep
"//pkg/ccl/logictestccl:testdata", # keep
],
exec_properties = {"Pool": "large"},
shard_count = 6,
tags = [
"ccl_test",
"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",
],
)
121 changes: 121 additions & 0 deletions pkg/ccl/logictestccl/tests/local-mixed-23.2/generated_test.go

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

Loading

0 comments on commit 722bf13

Please sign in to comment.