Merge pull request #16893 from bdarnell/deflake-split-snapshot

storage: Deflake TestSplitSnapshotRace_SnapshotWins

pkg/storage/client_split_test.go

@@ -1166,6 +1166,17 @@ func runSetupSplitSnapshotRace(
 	// Store 3 still has the old value, but 4 and 5 are up to date.
 	mtc.waitForValues(rightKey, []int64{0, 0, 0, 2, 5, 5})
 
+	// Scan the meta ranges to resolve all intents
+	if _, pErr := client.SendWrapped(context.Background(), mtc.distSenders[0],
+		&roachpb.ScanRequest{
+			Span: roachpb.Span{
+				Key:    keys.MetaMin,
+				EndKey: keys.MetaMax,
+			},
+		}); pErr != nil {
+		t.Fatal(pErr)
+	}
+
 	// Stop the remaining data stores.
 	mtc.stopStore(1)
 	mtc.stopStore(2)

pkg/storage/client_test.go

@@ -476,6 +476,7 @@ func (t *multiTestContextKVTransport) SendNext(ctx context.Context, done chan<-
 		t.mtc.mu.RUnlock()
 		// Make a copy and clone txn of batch args for sending.
 		baCopy := t.args
+		baCopy.Replica = rep.ReplicaDescriptor
 		if txn := baCopy.Txn; txn != nil {
 			txnClone := baCopy.Txn.Clone()
 			baCopy.Txn = &txnClone