release-23.1: storage: CheckSSTConflicts: fix instance of iterator mismatch #99755
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Backport 1/1 commits from #99695 on behalf of @itsbilal.
/cc @cockroachdb/release
Previously, in one case, we'd let the sst iterator advance ahead of the engine iterator, which violates an invariant in this function. This change fixes that case.
Fixes #99566.
Fixes #99010.
Epic: none
Release note: None
Release justification: Bugfix for a high-priority GA blocker.