Merge cockroachdb#97636

97636: kvserver: fix TestStoreRangeReadoptedLHSFollower flakiness r=tbg a=aliher1911 Added retry for the case where snapshot is still in flight. Release note: None Fixes cockroachdb#96986 Co-authored-by: Oleg Afanasyev <[email protected]>
KaiSun314 · Feb 27, 2023 · afb6820 · afb6820
2 parents 13c58f6 + 283f381
commit afb6820
Showing 1 changed file with 7 additions and 1 deletion.
diff --git a/pkg/kv/kvserver/client_merge_test.go b/pkg/kv/kvserver/client_merge_test.go
@@ -3160,7 +3160,13 @@ func TestStoreRangeReadoptedLHSFollower(t *testing.T) {
 			}
 			return nil
 		})
-		tc.RemoveVotersOrFatal(t, lhsDesc.StartKey.AsRawKey(), tc.Target(2))
+		// Need to retry because removing voters could fail while snapshots are
+		// still in flight and cause "cannot remove learner while snapshot is in
+		// flight" error.
+		testutils.SucceedsSoon(t, func() error {
+			_, err := tc.RemoveVoters(lhsDesc.StartKey.AsRawKey(), tc.Target(2))
+			return err
+		})
 
 		if withMerge {
 			// Merge the two ranges together.