Merge #135325

135325: server: skip TestHotRangesStats under race r=dhartunian a=dhartunian Resolves: #134144 Resolves: #134946 Resolves: #132219 Release note: None Co-authored-by: David Hartunian <[email protected]>
cockroachdb · Nov 15, 2024 · 6f00e54 · 6f00e54
2 parents 6da166b + c622e81
commit 6f00e54
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 0 deletions.
diff --git 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
@@ -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)()