From 077db910ead276d9f30210f9d5a91b851e974df9 Mon Sep 17 00:00:00 2001 From: Austen McClernon Date: Mon, 10 Jul 2023 13:57:44 +0000 Subject: [PATCH 1/2] kvserver: skip promote non voter under race 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: #105883 Release note: None --- pkg/kv/kvserver/replicate_queue_test.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/kv/kvserver/replicate_queue_test.go b/pkg/kv/kvserver/replicate_queue_test.go index 4b3ac82c04e7..99c26cec4aac 100644 --- 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() From 7c570d0134f62ced9b5ea90b1b475db297f2f6a3 Mon Sep 17 00:00:00 2001 From: Annie Pompa Date: Tue, 11 Jul 2023 14:37:18 -0400 Subject: [PATCH 2/2] authors: add Annie Pompa to authors Release note: None Epic: None --- AUTHORS | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/AUTHORS b/AUTHORS index e92e48b1fae7..062ea7318d85 100644 --- a/AUTHORS +++ b/AUTHORS @@ -77,7 +77,7 @@ Angela Dietz Angela Wen angelapwen Angela Xu angelazxu Anne Zhu -Annie Pompa +Annie Pompa Antoine Grondin Anzo Teh anzoteh96 Aqdas Imran