Skip to content

Commit

Permalink
Merge pull request #106628 from cockroachdb/blathers/backport-release…
Browse files Browse the repository at this point in the history
…-23.1-106514

release-23.1: kvserver: skip promote non voter under race
  • Loading branch information
erikgrinaker authored Jul 14, 2023
2 parents a50dd18 + fa79899 commit c93ce66
Showing 1 changed file with 2 additions and 1 deletion.
3 changes: 2 additions & 1 deletion pkg/kv/kvserver/replicate_queue_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -2200,10 +2200,11 @@ func TestPromoteNonVoterInAddVoter(t *testing.T) {
defer leaktest.AfterTest(t)()
defer log.Scope(t).Close(t)

// This test is slow under stress and can time out when upreplicating /
// This test is slow under stress/race and can time out when upreplicating /
// rebalancing to ensure all stores have the same range count initially, due
// to slow heartbeats.
skip.UnderStress(t)
skip.UnderRace(t)

ctx := context.Background()

Expand Down

0 comments on commit c93ce66

Please sign in to comment.