Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

roachtest: try to stabilize ORM nightlies #76442

Merged
merged 1 commit into from
Feb 12, 2022
+6 −11
Merged

roachtest: try to stabilize ORM nightlies #76442

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion pkg/cmd/roachtest/tests/activerecord.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ import (
var activerecordResultRegex = regexp.MustCompile(`^(?P<test>[^\s]+#[^\s]+) = (?P<timing>\d+\.\d+ s) = (?P<result>.)$`)
var railsReleaseTagRegex = regexp.MustCompile(`^v(?P<major>\d+)\.(?P<minor>\d+)\.(?P<point>\d+)\.?(?P<subpoint>\d*)$`)
var supportedRailsVersion = "6.1"
var activerecordAdapterVersion = "v6.1.3"
var activerecordAdapterVersion = "v6.1.5"

// This test runs activerecord's full test suite against a single cockroach node.

Expand Down
10 changes: 5 additions & 5 deletions pkg/cmd/roachtest/tests/orm_helpers.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -35,11 +35,11 @@ func alterZoneConfigAndClusterSettings(
defer db.Close()

for _, cmd := range []string{
`ALTER RANGE default CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 5;`,
`ALTER TABLE system.public.jobs CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 5;`,
`ALTER RANGE meta CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 5;`,
`ALTER RANGE system CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 5;`,
`ALTER RANGE liveness CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 5;`,
`ALTER RANGE default CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 30;`,
`ALTER TABLE system.public.jobs CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 30;`,
`ALTER RANGE meta CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 30;`,
`ALTER RANGE system CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 30;`,
`ALTER RANGE liveness CONFIGURE ZONE USING num_replicas = 1, gc.ttlseconds = 30;`,

`SET CLUSTER SETTING kv.range_merge.queue_interval = '50ms'`,
`SET CLUSTER SETTING kv.raft_log.disable_synchronization_unsafe = 'true'`,
Expand Down
1 change: 0 additions & 1 deletion pkg/cmd/roachtest/tests/psycopg_blocklist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,6 @@ var psycopgBlocklists = blocklistsForVersion{
// After a failed run, an updated version of this blocklist should be available
// in the test log.
var psycopgBlockList22_1 = blocklist{
"tests.test_async_keyword.CancelTests.test_async_cancel": "41335",
// The following item can be removed once there is a new psycopg2 release.
"tests.test_module.ExceptionsTestCase.test_9_6_diagnostics": "58035",
}
Expand Down
4 changes: 0 additions & 4 deletions pkg/cmd/roachtest/tests/ruby_pg_blocklist.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -43,7 +43,6 @@ var rubyPGBlockList22_1 = blocklist{
"Basic type mapping PG::BasicTypeMapForResults connection wide type mapping should do text datetime without time zone type conversions": "unknown",
"Basic type mapping PG::BasicTypeMapForResults with usage of result oids for copy decoder selection can type cast #copy_data output with explicit decoder": "unknown",
"PG::Connection accepts nil as the timeout in #wait_for_notify ": "unknown",
"PG::Connection allows a query to be cancelled": "unknown",
"PG::Connection automatically rolls back a transaction started with Connection#transaction if an exception is raised": "unknown",
"PG::Connection calls a block for NOTIFY events if one is given": "unknown",
"PG::Connection calls the block supplied to wait_for_notify with the notify payload if it accepts any number of arguments": "unknown",
Expand All @@ -62,7 +61,6 @@ var rubyPGBlockList22_1 = blocklist{
"PG::Connection correctly finishes COPY queries passed to #async_exec": "unknown",
"PG::Connection deprecated forms of methods should forward exec to exec_params": "unknown",
"PG::Connection deprecated forms of methods should forward send_query to send_query_params": "unknown",
"PG::Connection described_class#block shouldn't block a second thread": "unknown",
"PG::Connection doesn't collapse sequential notifications": "unknown",
"PG::Connection doesn't leave stale server connections after finish": "unknown",
"PG::Connection gracefully handle SQL statements while in #copy_data for input": "unknown",
Expand Down Expand Up @@ -120,7 +118,6 @@ var rubyPGBlockList22_1 = blocklist{
"PG::TypeMapByOid should allow mixed type conversions in text format": "unknown",
"PG::TypeMapByOid should build a TypeMapByColumn when assigned and the number of rows is high enough": "unknown",
"running with sync_* methods PG::Connection accepts nil as the timeout in #wait_for_notify ": "unknown",
"running with sync_* methods PG::Connection allows a query to be cancelled": "unknown",
"running with sync_* methods PG::Connection automatically rolls back a transaction started with Connection#transaction if an exception is raised": "unknown",
"running with sync_* methods PG::Connection calls a block for NOTIFY events if one is given": "unknown",
"running with sync_* methods PG::Connection calls the block supplied to wait_for_notify with the notify payload if it accepts any number of arguments": "unknown",
Expand All @@ -139,7 +136,6 @@ var rubyPGBlockList22_1 = blocklist{
"running with sync_* methods PG::Connection correctly finishes COPY queries passed to #async_exec": "unknown",
"running with sync_* methods PG::Connection deprecated forms of methods should forward exec to exec_params": "unknown",
"running with sync_* methods PG::Connection deprecated forms of methods should forward send_query to send_query_params": "unknown",
"running with sync_* methods PG::Connection described_class#block shouldn't block a second thread": "unknown",
"running with sync_* methods PG::Connection doesn't collapse sequential notifications": "unknown",
"running with sync_* methods PG::Connection doesn't leave stale server connections after finish": "unknown",
"running with sync_* methods PG::Connection gracefully handle SQL statements while in #copy_data for input": "unknown",
Expand Down