From f562686952ead69d802ba910553fc11b4adf9087 Mon Sep 17 00:00:00 2001 From: irfan sharif Date: Mon, 17 Jan 2022 19:00:41 -0500 Subject: [PATCH] server,status: disable reconciliation job for few stat tests It's unclear why these tests experience a massive slowdown. Investigating it is tracked as part of #74919. Release note: None --- pkg/ccl/serverccl/statusccl/tenant_status_test.go | 4 ++++ pkg/server/status_test.go | 7 +++++++ 2 files changed, 11 insertions(+) diff --git a/pkg/ccl/serverccl/statusccl/tenant_status_test.go b/pkg/ccl/serverccl/statusccl/tenant_status_test.go index 1d07a26c0b71..9eb14676c565 100644 --- a/pkg/ccl/serverccl/statusccl/tenant_status_test.go +++ b/pkg/ccl/serverccl/statusccl/tenant_status_test.go @@ -25,6 +25,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/roachpb" "github.com/cockroachdb/cockroach/pkg/security" "github.com/cockroachdb/cockroach/pkg/server/serverpb" + "github.com/cockroachdb/cockroach/pkg/spanconfig" "github.com/cockroachdb/cockroach/pkg/sql/catalog/catconstants" "github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb" "github.com/cockroachdb/cockroach/pkg/sql/sem/tree" @@ -91,6 +92,9 @@ func TestTenantCannotSeeNonTenantStats(t *testing.T) { ctx := context.Background() serverParams, _ := tests.CreateTestServerParams() + serverParams.Knobs.SpanConfig = &spanconfig.TestingKnobs{ + ManagerDisableJobCreation: true, // TODO(irfansharif): #74919. + } testCluster := serverutils.StartNewTestCluster(t, 3 /* numNodes */, base.TestClusterArgs{ ServerArgs: serverParams, }) diff --git a/pkg/server/status_test.go b/pkg/server/status_test.go index b03b820d9f7a..f3ba499aace6 100644 --- a/pkg/server/status_test.go +++ b/pkg/server/status_test.go @@ -41,6 +41,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/server/diagnostics/diagnosticspb" "github.com/cockroachdb/cockroach/pkg/server/serverpb" "github.com/cockroachdb/cockroach/pkg/server/status/statuspb" + "github.com/cockroachdb/cockroach/pkg/spanconfig" "github.com/cockroachdb/cockroach/pkg/sql" "github.com/cockroachdb/cockroach/pkg/sql/catalog/catconstants" "github.com/cockroachdb/cockroach/pkg/sql/catalog/descpb" @@ -1819,6 +1820,9 @@ func TestStatusAPIStatements(t *testing.T) { AOSTClause: "AS OF SYSTEM TIME '-1us'", StubTimeNow: func() time.Time { return timeutil.Unix(aggregatedTs, 0) }, }, + SpanConfig: &spanconfig.TestingKnobs{ + ManagerDisableJobCreation: true, // TODO(irfansharif): #74919. + }, }, }, }) @@ -1932,6 +1936,9 @@ func TestStatusAPICombinedStatements(t *testing.T) { AOSTClause: "AS OF SYSTEM TIME '-1us'", StubTimeNow: func() time.Time { return timeutil.Unix(aggregatedTs, 0) }, }, + SpanConfig: &spanconfig.TestingKnobs{ + ManagerDisableJobCreation: true, // TODO(irfansharif): #74919. + }, }, }, })