release-21.2: kvserver: declare lock spans for AddSSTable
#71983
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 #71676 on behalf of @erikgrinaker.
/cc @cockroachdb/release
AddSSTable
did not declare lock spans, even though it can returnWriteIntentError
when encountering unresolved intents (e.g. whenchecking for key collisions with
DisallowShadowing
set). This wouldcause the concurrency manager to error with e.g.:
This patch makes
AddSSTable
take out lock spans viaDefaultDeclareIsolatedKeys
ifDisallowShadowing
is set. This willautomatically handle any unresolved intents via the concurrency manager.
Release note (bug fix):
IMPORT INTO
no longer crashes when encounteringunresolved write intents.
Release justification: fixes a node crash.