From 32ebc7a582aabc7122efa5b1dec5798a3ccd1567 Mon Sep 17 00:00:00 2001 From: Michael Butler Date: Sat, 7 Jan 2023 10:56:54 -0500 Subject: [PATCH 1/3] kv/multitenant: skip TestExplainMVCCSteps and TestTransientClusterMultitenant Informs #94862 #94881 Release Note: none Epic: none --- pkg/cli/democluster/demo_cluster_test.go | 1 + pkg/sql/explain_test.go | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/cli/democluster/demo_cluster_test.go b/pkg/cli/democluster/demo_cluster_test.go index 91070e9057d3..0f1781a95848 100644 --- a/pkg/cli/democluster/demo_cluster_test.go +++ b/pkg/cli/democluster/demo_cluster_test.go @@ -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. diff --git a/pkg/sql/explain_test.go b/pkg/sql/explain_test.go index a5e90b12a727..a398e0f314da 100644 --- a/pkg/sql/explain_test.go +++ b/pkg/sql/explain_test.go @@ -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) From da73343215bc3a119b4bbe6b39b1e75c3a7c155b Mon Sep 17 00:00:00 2001 From: Michael Butler Date: Sat, 7 Jan 2023 12:15:44 -0500 Subject: [PATCH 2/3] acceptance: skip TestDockerCLI/test_sql_mem_monitor Release note: none Epic: none --- ...test_sql_mem_monitor.tcl => test_sql_mem_monitor.tcl.disabled} | 0 1 file changed, 0 insertions(+), 0 deletions(-) rename pkg/cli/interactive_tests/{test_sql_mem_monitor.tcl => test_sql_mem_monitor.tcl.disabled} (100%) diff --git a/pkg/cli/interactive_tests/test_sql_mem_monitor.tcl b/pkg/cli/interactive_tests/test_sql_mem_monitor.tcl.disabled similarity index 100% rename from pkg/cli/interactive_tests/test_sql_mem_monitor.tcl rename to pkg/cli/interactive_tests/test_sql_mem_monitor.tcl.disabled From ace7251ccff072465d58e92703ecdf332458b1ff Mon Sep 17 00:00:00 2001 From: Steven Danna Date: Fri, 6 Jan 2023 21:25:10 +0000 Subject: [PATCH 3/3] streamingccl: skip TestDataDriven/alter_tenant This test is flakey. We will unskip it when #94855 is resolved. Epic: none Release note: None --- pkg/ccl/streamingccl/streamingest/datadriven_test.go | 10 ++++++++++ .../streamingccl/streamingest/testdata/alter_tenant | 5 ++++- 2 files changed, 14 insertions(+), 1 deletion(-) diff --git a/pkg/ccl/streamingccl/streamingest/datadriven_test.go b/pkg/ccl/streamingccl/streamingest/datadriven_test.go index ea5e0bb50299..4fc1c9f46470 100644 --- a/pkg/ccl/streamingccl/streamingest/datadriven_test.go +++ b/pkg/ccl/streamingccl/streamingest/datadriven_test.go @@ -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" @@ -71,6 +72,9 @@ import ( // - query-sql as= // 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) @@ -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() diff --git a/pkg/ccl/streamingccl/streamingest/testdata/alter_tenant b/pkg/ccl/streamingccl/streamingest/testdata/alter_tenant index 20a341a7ca9a..c1ca3508c0d6 100644 --- a/pkg/ccl/streamingccl/streamingest/testdata/alter_tenant +++ b/pkg/ccl/streamingccl/streamingest/testdata/alter_tenant @@ -1,3 +1,6 @@ +skip issue-num=94855 +---- + create-replication-clusters ---- @@ -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