Merge cockroachdb#106514 cockroachdb#106615

106514: kvserver: skip promote non voter under race r=erikgrinaker a=kvoli TestPromoteNonVoterInAddVoter requires that the initial range count of each store is balanced. Under stress/race builds this takes much longer and may time out before achieved. TestPromoteNonVoterInAddVoter was already skipped under stress, also skip the test under race. Resolves: cockroachdb#105883 Release note: None 106615: authors: add Annie Pompa to authors r=<andyyang890> a=annrpom Release note: None Epic: None Co-authored-by: Austen McClernon <[email protected]> Co-authored-by: Annie Pompa <[email protected]>
adityamaru · Jul 11, 2023 · 27e36a0 · 27e36a0
3 parents cc97c06 + 077db91 + 7c570d0
commit 27e36a0
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 2 deletions.
diff --git a/AUTHORS b/AUTHORS
@@ -77,7 +77,7 @@ Angela Dietz <[email protected]>
 Angela Wen <[email protected]> angelapwen <[email protected]>
 Angela Xu <[email protected]> angelazxu <[email protected]>
 Anne Zhu <[email protected]>
-Annie Pompa <annie.pompa@cockroachlabs.com> <[email protected]>
+Annie Pompa <[email protected]> <[email protected]>
 Antoine Grondin <[email protected]>
 Anzo Teh <[email protected]> anzoteh96 <[email protected]> <[email protected]>
 Aqdas Imran <[email protected]> <[email protected]>

diff --git a/pkg/kv/kvserver/replicate_queue_test.go b/pkg/kv/kvserver/replicate_queue_test.go
@@ -2211,10 +2211,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()