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]>

Author: 3 people

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]>

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()