Merge #152587

152587: kvserver: deflake TestRaftForceCampaignPreVoteCheckQuorum r=pav-kv a=miraradeva

The test seems to fail if `ForceCampaign` is called while there are still pending config changes. This commit adds a check for this case.

Fixes: #152555

Release note: None

Co-authored-by: Mira Radeva <[email protected]>

Author: craig[bot]

pkg/kv/kvserver/client_raft_test.go

@@ -6165,6 +6165,9 @@ func TestRaftForceCampaignPreVoteCheckQuorum(t *testing.T) {
 	// Create a range, upreplicate it, and replicate a write.
 	key := tc.ScratchRange(t)
 	desc := tc.AddVotersOrFatal(t, key, tc.Targets(1, 2)...)
+	// Wait for the config changes corresponding to adding voters to be finalized.
+	// Otherwise, the forced campaign can fail and not retry. See #152555.
+	require.NoError(t, tc.WaitForVoters(key, tc.Targets(0, 1, 2)...))
 	_, pErr := kv.SendWrapped(ctx, sender, incrementArgs(key, 1))
 	require.NoError(t, pErr.GoError())
 	tc.WaitForValues(t, key, []int64{1, 1, 1})