storage: CheckSSTConflicts: fix instance of iterator mismatch

[itsbilal]

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

[cockroach-teamcity]

This change is 

[itsbilal]

Stressed the seeds in both #99010 and #99566 and they both pass with this change.

[RaduBerinde]

pkg/storage/sst.go line 1140 at r1 (raw file):

						sstIter.SeekGE(MVCCKey{Key: extIter.UnsafeKey().Key})
						sstOK, sstErr = sstIter.Valid()
						extIter.SeekGE(MVCCKey{Key: sstIter.UnsafeKey().Key})

Do we know for sure that sstOK will be true now? In any case, would it make more sense to remove the extChangedKeys in the condition below and let it fall through?

[itsbilal]

pkg/storage/sst.go line 1140 at r1 (raw file):

Previously, RaduBerinde wrote…

Do we know for sure that sstOK will be true now? In any case, would it make more sense to remove the extChangedKeys in the condition below and let it fall through?

I had just realized I pushed an older commit. Fixed this now.

[RaduBerinde]

pkg/storage/sst.go line 1140 at r1 (raw file):

Previously, itsbilal (Bilal Akhtar) wrote…

I had just realized I pushed an older commit. Fixed this now.

Should we also check extOK?

[itsbilal]

pkg/storage/sst.go line 1140 at r1 (raw file):

Previously, RaduBerinde wrote…

Should we also check extOK?

We don't need to, because !extChangedKeys guarantees extOK.

[RaduBerinde]

Reviewable status: complete! 1 of 0 LGTMs obtained (waiting on @erikgrinaker and @jbowens)

---

pkg/storage/sst.go line 1140 at r1 (raw file):

Previously, itsbilal (Bilal Akhtar) wrote…

We don't need to, because !extChangedKeys guarantees extOK.

Ah, indeed.

[itsbilal]

TFTR!

bors r=RaduBerinde

[craig]

Build failed:

• Bazel Essential CI (Cockroach)

[itsbilal]

Acceptance test timeout.

bors retry

[craig]

Build failed (retrying...):

• Bazel Essential CI (Cockroach)

[craig]

Build failed (retrying...):

• Bazel Essential CI (Cockroach)

[craig]

Build succeeded:

• Bazel Essential CI (Cockroach)