Skip to content

Commit

Permalink
server,status: disable reconciliation job for few stat tests
Browse files Browse the repository at this point in the history
It's unclear why these tests experience a massive slowdown.
Investigating it is tracked as part of cockroachdb#74919.

Release note: None
  • Loading branch information
irfansharif committed Jan 18, 2022
1 parent 3f383fd commit 4f6fc15
Show file tree
Hide file tree
Showing 4 changed files with 13 additions and 0 deletions.
1 change: 1 addition & 0 deletions pkg/ccl/serverccl/statusccl/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ go_test(
"//pkg/security/securitytest",
"//pkg/server",
"//pkg/server/serverpb",
"//pkg/spanconfig",
"//pkg/sql/catalog/catconstants",
"//pkg/sql/catalog/descpb",
"//pkg/sql/sem/tree",
Expand Down
4 changes: 4 additions & 0 deletions pkg/ccl/serverccl/statusccl/tenant_status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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,
})
Expand Down
1 change: 1 addition & 0 deletions pkg/server/BUILD.bazel
Original file line number Diff line number Diff line change
Expand Up @@ -342,6 +342,7 @@ go_test(
"//pkg/server/telemetry",
"//pkg/settings",
"//pkg/settings/cluster",
"//pkg/spanconfig",
"//pkg/sql",
"//pkg/sql/catalog/catalogkeys",
"//pkg/sql/catalog/catconstants",
Expand Down
7 changes: 7 additions & 0 deletions pkg/server/status_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -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"
Expand Down Expand Up @@ -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.
},
},
},
})
Expand Down Expand Up @@ -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.
},
},
},
})
Expand Down

0 comments on commit 4f6fc15

Please sign in to comment.