diff --git a/pkg/kv/kvserver/client_merge_test.go b/pkg/kv/kvserver/client_merge_test.go index c42254439d8a..c2e662ceaeca 100644 --- a/pkg/kv/kvserver/client_merge_test.go +++ b/pkg/kv/kvserver/client_merge_test.go @@ -417,6 +417,7 @@ func TestStoreRangeMergeTimestampCache(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) skip.UnderShort(t) + skip.UnderRace(t) testutils.RunTrueAndFalse(t, "disjoint-leaseholders", func(t *testing.T, disjointLeaseholders bool) { testutils.RunTrueAndFalse(t, "through-snapshot", func(t *testing.T, throughSnapshot bool) { @@ -4465,6 +4466,8 @@ func TestMergeQueueSeesNonVoters(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) + skip.UnderRace(t) + type test struct { name string leftVoters, rightVoters, leftNonVoters, rightNonVoters []int diff --git a/pkg/kv/kvserver/closed_timestamp_test.go b/pkg/kv/kvserver/closed_timestamp_test.go index 55e703585350..862d12b24879 100644 --- a/pkg/kv/kvserver/closed_timestamp_test.go +++ b/pkg/kv/kvserver/closed_timestamp_test.go @@ -606,6 +606,8 @@ func TestClosedTimestampFrozenAfterSubsumption(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) + skip.UnderRace(t) + for _, test := range []struct { name string // transferLease, if set, will be called while the RHS is subsumed in order diff --git a/pkg/kv/kvserver/replica_closedts_test.go b/pkg/kv/kvserver/replica_closedts_test.go index 67261059102e..97692e703bdb 100644 --- a/pkg/kv/kvserver/replica_closedts_test.go +++ b/pkg/kv/kvserver/replica_closedts_test.go @@ -28,6 +28,7 @@ import ( "github.com/cockroachdb/cockroach/pkg/server" "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/testutils/testcluster" "github.com/cockroachdb/cockroach/pkg/util/hlc" @@ -45,6 +46,9 @@ import ( func TestBumpSideTransportClosed(t *testing.T) { defer leaktest.AfterTest(t)() defer log.Scope(t).Close(t) + + skip.UnderRace(t) + ctx := context.Background() type setupArgs struct { diff --git a/pkg/kv/kvserver/replica_learner_test.go b/pkg/kv/kvserver/replica_learner_test.go index 9599fae0101a..1897948cd25f 100644 --- a/pkg/kv/kvserver/replica_learner_test.go +++ b/pkg/kv/kvserver/replica_learner_test.go @@ -312,6 +312,7 @@ func TestLearnerSnapshotFailsRollback(t *testing.T) { defer log.Scope(t).Close(t) skip.UnderShort(t) // Takes 90s. + skip.UnderRace(t) runTest := func(t *testing.T, replicaType roachpb.ReplicaType) { var rejectSnapshots int64