From c622e817132435fa86fe70f196be381188c6c312 Mon Sep 17 00:00:00 2001 From: David Hartunian Date: Fri, 15 Nov 2024 15:17:05 -0500 Subject: [PATCH] server: skip TestHotRangesStats under race Resolves: #134144 Resolves: #134946 Resolves: #132219 Release note: None --- pkg/server/structlogging/BUILD.bazel | 1 + pkg/server/structlogging/hot_ranges_log_test.go | 3 +++ 2 files changed, 4 insertions(+) diff --git a/pkg/server/structlogging/BUILD.bazel b/pkg/server/structlogging/BUILD.bazel index a26841ac57fc..1d00b4b04b18 100644 --- a/pkg/server/structlogging/BUILD.bazel +++ b/pkg/server/structlogging/BUILD.bazel @@ -41,6 +41,7 @@ go_test( "//pkg/sql/catalog/desctestutils", "//pkg/testutils", "//pkg/testutils/serverutils", + "//pkg/testutils/skip", "//pkg/testutils/sqlutils", "//pkg/testutils/testcluster", "//pkg/util/leaktest", diff --git a/pkg/server/structlogging/hot_ranges_log_test.go b/pkg/server/structlogging/hot_ranges_log_test.go index a9cdd09223a3..e89d0ea1071e 100644 --- a/pkg/server/structlogging/hot_ranges_log_test.go +++ b/pkg/server/structlogging/hot_ranges_log_test.go @@ -20,6 +20,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/sql/catalog/desctestutils" "github.com/cockroachdb/cockroach/pkg/testutils" "github.com/cockroachdb/cockroach/pkg/testutils/serverutils" + "github.com/cockroachdb/cockroach/pkg/testutils/skip" "github.com/cockroachdb/cockroach/pkg/testutils/sqlutils" "github.com/cockroachdb/cockroach/pkg/util/leaktest" "github.com/cockroachdb/cockroach/pkg/util/log" @@ -80,6 +81,8 @@ func TestHotRangesStats(t *testing.T) { sc := log.ScopeWithoutShowLogs(t) defer sc.Close(t) + skip.UnderRace(t) + ctx := context.Background() spy := hotRangesLogSpy{t: t} defer log.InterceptWith(ctx, &spy)()