Merge #79406

79406: batcheval: disable assettions on addsstable above scan r=yuzefovich a=dt Release note: none. Jira issue: CRDB-14810 Co-authored-by: David Taylor <[email protected]>
cockroachdb · Apr 5, 2022 · b89a636 · b89a636
2 parents 8ac1611 + 04bb436
commit b89a636
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/pkg/kv/kvserver/batcheval/cmd_add_sstable.go b/pkg/kv/kvserver/batcheval/cmd_add_sstable.go
@@ -301,7 +301,7 @@ func EvalAddSSTable(
 	// addition, and instead just use this key-only iterator. If a caller actually
 	// needs to know what data is there, it must issue its own real Scan.
 	if args.ReturnFollowingLikelyNonEmptySpanStart {
-		existingIter := readWriter.NewMVCCIterator(
+		existingIter := spanset.DisableReaderAssertions(readWriter).NewMVCCIterator(
 			storage.MVCCKeyIterKind, // don't care if it is committed or not, just that it isn't empty.
 			storage.IterOptions{UpperBound: reply.RangeSpan.EndKey},
 		)