roachtest: make roachtest recognize 21.2 #69829

celiala · 2021-09-03T22:47:07Z

Shortly after Creating a release branch for release-21.2, we'll want to merge PRs as instructed by the New major version checklist.

This PR is for Step 2c of the New major version checklist, where we update the ORM tests. Specifically, adding block/ignore lists for the vNEXT major version for these files:

ls pkg/cmd/roachtest/tests/*_blocklist.go

This PR is one of the tasks detailed in #70751, which tracks all the steps relevant to creating a release branch for ${vBRANCH_CUT} and preparing master for the ${vNEXT} major version.

Release justification: Non-production code change.
Release note: None

cockroach-teamcity · 2021-09-03T22:47:15Z

This change is

celiala · 2021-09-03T23:01:52Z

pkg/cmd/roachtest/tests/activerecord_blocklist.go

 var activeRecordBlockList21_2 = blocklist{}

 var activeRecordBlockList21_1 = blocklist{}

 var activeRecordBlockList20_2 = blocklist{}

+// TODO(celia) -- what should be in blocklist{}, if anything?


Maybe @rafiss ?

celiala · 2021-09-03T23:02:05Z

pkg/cmd/roachtest/tests/django_blocklist.go

 var djangoBlocklist21_2 = djangoBlocklist21_1

 var djangoBlocklist21_1 = djangoBlocklist20_2

 var djangoBlocklist20_2 = blocklist{}

+// TODO(celia) -- what should be in blocklist{}, if anything?


Maybe @RichardJCai ?

We can probably just start with empty blocklists here and see what errors we run into.

celiala · 2021-09-03T23:02:37Z

pkg/cmd/roachtest/tests/hibernate_blocklist.go

 var hibernateSpatialBlockList21_2 = blocklist{}

 var hibernateSpatialBlockList21_1 = blocklist{}

+// TODO(celia) -- what should be in blocklist{}, if anything?


celiala · 2021-09-03T23:03:25Z

pkg/cmd/roachtest/tests/pgjdbc_blocklist.go

 }

 // Please keep these lists alphabetized for easy diffing.
 // After a failed run, an updated version of this blocklist should be available
 // in the test log.
+// TODO(celia) -- what should be in blocklist{}, if anything?


@rafiss - here too, thx!

celiala · 2021-09-03T23:03:52Z

pkg/cmd/roachtest/tests/psycopg_blocklist.go

@@ -27,6 +28,9 @@ var psycopgBlocklists = blocklistsForVersion{
 // Please keep these lists alphabetized for easy diffing.
 // After a failed run, an updated version of this blocklist should be available
 // in the test log.
+// TODO(celia) -- what should be in blocklist{}, if anything?


here too @rafiss - thank you :)

celiala · 2021-09-03T23:04:57Z

pkg/cmd/roachtest/tests/tpchvec.go

@@ -31,6 +31,9 @@ import (
 	"github.com/cockroachdb/cockroach/pkg/workload/tpch"
 )

+// TODO(celia) -- there used to be a toCRDBVersion() here -- confirm that


Maybe @yuzefovich ?

yuzefovich

Reviewable status: complete! 0 of 0 LGTMs obtained (waiting on @celiala)

pkg/cmd/roachtest/tests/tpchvec.go, line 34 at r1 (raw file):

Previously, celiala wrote…

Maybe @yuzefovich ?

It's all good - it was no longer needed and was removed.

rafiss

Reviewable status: complete! 0 of 0 LGTMs obtained (waiting on @celiala)

pkg/cmd/roachtest/tests/django_blocklist.go, line 180 at r1 (raw file):

Previously, RichardJCai (Richard Cai) wrote…

We can probably just start with empty blocklists here and see what errors we run into.

+1 here's the full approach we should use:

if the v21.2 blocklist is empty, then the new v22.1 blocklist should be empty too
if the v21.2 is not empty, then set var toolBlocklist22_1 = toolBlocklist21_2

69826: clusterversion: mint 21.2 cluster version r=celiala a=celiala Shortly after [Creating a release branch](https://cockroachlabs.atlassian.net/wiki/spaces/ENG/pages/187859111/Creating+a+release+branch) for release-21.2, we'll want to merge PRs as instructed by the [New major version checklist](https://cockroachlabs.atlassian.net/wiki/spaces/ENG/pages/1522270228/New+major+version+checklist). This PR is for Step 1a of the [New major version checklist](https://cockroachlabs.atlassian.net/wiki/spaces/ENG/pages/1522270228/New+major+version+checklist), where we add a cluster version StartX for the corresponding .0 release. Notes: - **This should NOT be merged until we've released a beta** (adding `do-not-merge` until this happens) - These are all PRs created as part of the steps of the [New major version checklist](https://cockroachlabs.atlassian.net/wiki/spaces/ENG/pages/1522270228/New+major+version+checklist): - Step 1a (you are here): #69826 - Step 1b: #69828 - Step 2a + Step 2b: #69827 - Step 2c: #69829 - Step 3: TODO Release justification: Non-production code change. Release note: None 70750: tenant: add endpoint with instant metrics r=darinpp a=darinpp Previously the tenant process was serving various metrics on `/_status/vars`. This endpoint has all the available metrics and these are updated every 10 sec. Many of the metrics show a rate that is calculated over the 10 sec interval. Some of the metrics are used by the cockroach operator to monitor the CPU workload of the tenant process and use that workload for automatic scaling. The 10 sec interval however is too long and causes a slow scaling up. The reporting of high CPU utilization can take up to 20 sec (to compute a delta). To resolve this, the PR adds a new endpoint `/_status/load` that provides an instant reading of a very small subset of the normal metrics - user and system CPU time for now. By having these be instant, the client can retrieve in quick succession, consecutive snapshots and compute a precise CPU utulization. It also allows the client to control the interval between the two pulls (as opposed to having it hard coded to 10 sec). Release note: None Co-authored-by: Celia La <[email protected]> Co-authored-by: Darin Peshev <[email protected]>

Release justification: Non-production code change. Release note: None

celiala

Implemented feedback - this is RFAL:

In terms of exactly when to merge this, let me know if I should hold off until a specific time? Otherwise, I'll plan to merge this as soon as this looks good to reviewers. Thanks!

+1 here's the full approach we should use:

if the v21.2 blocklist is empty, then the new v22.1 blocklist should be empty too

if the v21.2 is not empty, then set var toolBlocklist22_1 = toolBlocklist21_2

Done

Reviewable status: complete! 0 of 0 LGTMs obtained (waiting on @rafiss, @RichardJCai, and @yuzefovich)

pkg/cmd/roachtest/tests/django_blocklist.go, line 180 at r1 (raw file):

+1 here's the full approach we should use:
if the v21.2 blocklist is empty, then the new v22.1 blocklist should be empty too
if the v21.2 is not empty, then set var toolBlocklist22_1 = toolBlocklist21_2

Done

rafiss

thanks!

celiala · 2021-10-01T21:52:41Z

TFTR!

bors r+

craig · 2021-10-01T22:45:03Z

Build succeeded:

GitHub CI (Cockroach)

celiala added the do-not-merge bors won't merge a PR with this label. label Sep 3, 2021

celiala changed the title ~~clusterversion: mint 21.2 cluster version~~ roachtest: make roachtest recognize 21.2 Sep 3, 2021

celiala force-pushed the roachtest-recognize-22.1 branch from d5f34c6 to 70567ad Compare September 3, 2021 22:51

celiala mentioned this pull request Sep 3, 2021

clusterversion: mint 21.2 cluster version #69826

Merged

celiala commented Sep 3, 2021

View reviewed changes

This was referenced Sep 3, 2021

clusterversion: introduce 22.1 development versions #69828

Merged

roachtest: update version map and test fixtures for 22.1 #69827

Merged

yuzefovich reviewed Sep 7, 2021

View reviewed changes

celiala force-pushed the roachtest-recognize-22.1 branch from 70567ad to 2762308 Compare September 8, 2021 22:33

celiala requested a review from rafiss September 8, 2021 22:36

rafiss requested changes Sep 14, 2021

View reviewed changes

celiala mentioned this pull request Sep 27, 2021

Major Release Process Checklist for 21.2 #70751

Closed

19 tasks

roachtest: make roachtest recognize 21.2

d6ba75a

Release justification: Non-production code change. Release note: None

celiala force-pushed the roachtest-recognize-22.1 branch from 2762308 to d6ba75a Compare October 1, 2021 18:54

celiala commented Oct 1, 2021

View reviewed changes

celiala removed the do-not-merge bors won't merge a PR with this label. label Oct 1, 2021

celiala requested a review from rafiss October 1, 2021 20:15

rafiss approved these changes Oct 1, 2021

View reviewed changes

craig bot merged commit fb0940f into cockroachdb:master Oct 1, 2021

celiala deleted the roachtest-recognize-22.1 branch April 5, 2022 04:25

Provide feedback

Saved searches

Use saved searches to filter your results more quickly

roachtest: make roachtest recognize 21.2 #69829

roachtest: make roachtest recognize 21.2 #69829

celiala commented Sep 3, 2021 •

edited

Loading

cockroach-teamcity commented Sep 3, 2021

celiala Sep 3, 2021

celiala Sep 3, 2021

RichardJCai Sep 8, 2021

celiala Sep 3, 2021

celiala Sep 3, 2021

celiala Sep 3, 2021

celiala Sep 3, 2021

yuzefovich left a comment

rafiss left a comment

celiala left a comment

rafiss left a comment

celiala commented Oct 1, 2021

craig bot commented Oct 1, 2021

roachtest: make roachtest recognize 21.2 #69829

roachtest: make roachtest recognize 21.2 #69829

Conversation

celiala commented Sep 3, 2021 • edited Loading

cockroach-teamcity commented Sep 3, 2021

celiala Sep 3, 2021

Choose a reason for hiding this comment

celiala Sep 3, 2021

Choose a reason for hiding this comment

RichardJCai Sep 8, 2021

Choose a reason for hiding this comment

celiala Sep 3, 2021

Choose a reason for hiding this comment

celiala Sep 3, 2021

Choose a reason for hiding this comment

celiala Sep 3, 2021

Choose a reason for hiding this comment

celiala Sep 3, 2021

Choose a reason for hiding this comment

yuzefovich left a comment

Choose a reason for hiding this comment

rafiss left a comment

Choose a reason for hiding this comment

celiala left a comment

Choose a reason for hiding this comment

rafiss left a comment

Choose a reason for hiding this comment

celiala commented Oct 1, 2021

craig bot commented Oct 1, 2021

celiala commented Sep 3, 2021 •

edited

Loading