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

kv/multitenant: skip TestExplainMVCCSteps, TestTransientClusterMultitenant, TestDockerCLI/test_sql_mem_monitor #94882

Merged
merged 3 commits into from
Jan 7, 2023
Merged

kv/multitenant: skip TestExplainMVCCSteps, TestTransientClusterMultitenant, TestDockerCLI/test_sql_mem_monitor #94882

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
32ebc7a
kv/multitenant: skip TestExplainMVCCSteps and TestTransientClusterMul…
msbutler Jan 7, 2023
da73343
acceptance: skip TestDockerCLI/test_sql_mem_monitor
msbutler Jan 7, 2023
ace7251
streamingccl: skip TestDataDriven/alter_tenant
stevendanna Jan 6, 2023
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
10 changes: 10 additions & 0 deletions pkg/ccl/streamingccl/streamingest/datadriven_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -21,6 +21,7 @@ import (
"github.com/cockroachdb/cockroach/pkg/jobs/jobspb"
"github.com/cockroachdb/cockroach/pkg/sql/sem/tree"
"github.com/cockroachdb/cockroach/pkg/testutils/datapathutils"
"github.com/cockroachdb/cockroach/pkg/testutils/skip"
"github.com/cockroachdb/cockroach/pkg/testutils/sqlutils"
"github.com/cockroachdb/cockroach/pkg/util/hlc"
"github.com/cockroachdb/cockroach/pkg/util/leaktest"
Expand Down Expand Up @@ -71,6 +72,9 @@ import (
// - query-sql as=<source-system | source-tenant | destination-system | destination-tenant>
// Executes the specified SQL query as the specified tenant, and prints the
// results.
//
// - skip issue-num=N
// Skips the test.
func TestDataDriven(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)
Expand All @@ -85,6 +89,12 @@ func TestDataDriven(t *testing.T) {
}

switch d.Cmd {
case "skip":
var issue int
d.ScanArgs(t, "issue-num", &issue)
skip.WithIssue(t, issue)
return ""

case "create-replication-clusters":
args := replicationtestutils.DefaultTenantStreamingClustersArgs
var cleanup func()
Expand Down
5 changes: 4 additions & 1 deletion pkg/ccl/streamingccl/streamingest/testdata/alter_tenant
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,6 @@
skip issue-num=94855
----

create-replication-clusters
----

Expand All @@ -11,6 +14,6 @@ ALTER TENANT "destination" SET REPLICATION RETENTION = '42s'
query-sql as=destination-system
SELECT crdb_internal.pb_to_json('payload', payload)->'streamIngestion'->'replicationTtlSeconds' as retention_ttl_seconds
FROM system.jobs
WHERE id = (SELECT replication_job_id FROM [SHOW TENANT"destination" WITH REPLICATION STATUS])
WHERE id = (SELECT replication_job_id FROM [SHOW TENANT "destination" WITH REPLICATION STATUS])
----
42
1 change: 1 addition & 0 deletions pkg/cli/democluster/demo_cluster_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -260,6 +260,7 @@ func TestTransientClusterMultitenant(t *testing.T) {
// This test is too slow to complete under the race detector, sometimes.
skip.UnderRace(t)
skip.UnderStress(t)
skip.WithIssue(t, 94862)

demoCtx := newDemoCtx()
// Set up an empty 3-node cluster with tenants on each node.
Expand Down
0 ...nteractive_tests/test_sql_mem_monitor.tcl → ...e_tests/test_sql_mem_monitor.tcl.disabled
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion pkg/sql/explain_test.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -332,7 +332,7 @@ func TestExplainMVCCSteps(t *testing.T) {
skip.UnderMetamorphic(t,
"this test expects a precise number of scan requests, which is not upheld "+
"in the metamorphic configuration that edits the kv batch size.")

skip.WithIssue(t, 94881)
ctx := context.Background()
srv, godb, _ := serverutils.StartServer(t, base.TestServerArgs{Insecure: true})
defer srv.Stopper().Stop(ctx)
Expand Down