-
Notifications
You must be signed in to change notification settings - Fork 3.8k
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
storage: handle intents under ingested range key in CheckSSTConflicts #94395
storage: handle intents under ingested range key in CheckSSTConflicts #94395
Conversation
Previously, we were returning an obscure error around MVCCValueLenAndIsTombstone not being supported for interleaved intents if we encountered an intent in the engine. This change fixes that to return a more appropriate error. This change also fixes a case where the engine iterator would unexpectedly land on a key < the sst iterator, violating an invariant in this function. Fixes parts of cockroachdb#94141. Release note: None Epic: none
395abe5
to
745100d
Compare
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
re: the backport-22.2.x
label, do we actually need to backport this? MVCCValueLenAndIsTombstone
does not exist on 22.2.
Reviewable status: complete! 1 of 0 LGTMs obtained
Not particularly important, since we don't ingest SSTs with range keys in production code. We were planning to start testing tenant replication with serverless on 22.2, which will ingest range keys, although I doubt these will use conflict checks. Would be nice to backport any correctness fixes if it's straightforward though. As for |
Maybe I misunderstood what you meant. The problem isn't really that |
TFTRs! I'll work on the backport shortly, as it'll have to be manual. bors r=erikgrinaker |
Build succeeded: |
Encountered an error creating backports. Some common things that can go wrong:
You might need to create your backport manually using the backport tool. error creating merge commit from 745100d to blathers/backport-release-22.2-94395: POST https://api.github.com/repos/cockroachdb/cockroach/merges: 409 Merge conflict [] you may need to manually resolve merge conflicts with the backport tool. Backport to branch 22.2.x failed. See errors above. 🦉 Hoot! I am a Blathers, a bot for CockroachDB. My owner is otan. |
Previously, we were returning an obscure error around MVCCValueLenAndIsTombstone not being supported for interleaved intents if we encountered an intent in the engine. This change fixes that to return a more appropriate error.
This change also fixes a case where the engine iterator would unexpectedly land on a key < the sst iterator, violating an invariant in this function.
Fixes parts of #94141.
Release note: None
Epic: None