Skip to content
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

release-21.2: kvserver: declare lock spans for AddSSTable #71983

Merged
merged 1 commit into from
Nov 16, 2021

Conversation

blathers-crl[bot]
Copy link

@blathers-crl blathers-crl bot commented Oct 26, 2021

Backport 1/1 commits from #71676 on behalf of @erikgrinaker.

/cc @cockroachdb/release


AddSSTable did not declare lock spans, even though it can return
WriteIntentError when encountering unresolved intents (e.g. when
checking for key collisions with DisallowShadowing set). This would
cause the concurrency manager to error with e.g.:

cannot handle WriteIntentError ‹conflicting intents on /Table/84/1/99/49714/0›
for request without lockTableGuard; were lock spans declared for this request?

This patch makes AddSSTable take out lock spans via
DefaultDeclareIsolatedKeys if DisallowShadowing is set. This will
automatically handle any unresolved intents via the concurrency manager.

Release note (bug fix): IMPORT INTO no longer crashes when encountering
unresolved write intents.


Release justification: fixes a node crash.

`AddSSTable` did not declare lock spans, even though it can return
`WriteIntentError` when encountering unresolved intents (e.g. when
checking for key collisions with `DisallowShadowing` set). This would
cause the concurrency manager to error with e.g.:

```
cannot handle WriteIntentError ‹conflicting intents on /Table/84/1/99/49714/0›
for request without lockTableGuard; were lock spans declared for this request?
```

This patch makes `AddSSTable` take out lock spans via
`DefaultDeclareIsolatedKeys` if `DisallowShadowing` is set. This will
automatically handle any unresolved intents via the concurrency manager.

Release note (bug fix): `IMPORT INTO` no longer crashes when encountering
unresolved write intents.
@blathers-crl blathers-crl bot requested a review from a team as a code owner October 26, 2021 13:49
@blathers-crl blathers-crl bot force-pushed the blathers/backport-release-21.2-71676 branch from c9d5a02 to e6542f5 Compare October 26, 2021 13:49
@blathers-crl
Copy link
Author

blathers-crl bot commented Oct 26, 2021

Thanks for opening a backport.

Please check the backport criteria before merging:

  • Patches should only be created for serious issues or test-only changes.
  • Patches should not break backwards-compatibility.
  • Patches should change as little code as possible.
  • Patches should not change on-disk formats or node communication protocols.
  • Patches should not add new functionality.
  • Patches must not add, edit, or otherwise modify cluster versions; or add version gates.
If some of the basic criteria cannot be satisfied, ensure that the exceptional criteria are satisfied within.
  • There is a high priority need for the functionality that cannot wait until the next release and is difficult to address in another way.
  • The new functionality is additive-only and only runs for clusters which have specifically “opted in” to it (e.g. by a cluster setting).
  • New code is protected by a conditional check that is trivial to verify and ensures that it only runs for opt-in clusters.
  • The PM and TL on the team that owns the changed code have signed off that the change obeys the above rules.

Add a brief release justification to the body of your PR to justify this backport.

Some other things to consider:

  • What did we do to ensure that a user that doesn’t know & care about this backport, has no idea that it happened?
  • Will this work in a cluster of mixed patch versions? Did we test that?
  • If a user upgrades a patch version, uses this feature, and then downgrades, what happens?

@cockroach-teamcity
Copy link
Member

This change is Reviewable

@erikgrinaker erikgrinaker removed request for a team and erikgrinaker October 27, 2021 08:11
@erikgrinaker erikgrinaker merged commit 37129c9 into release-21.2 Nov 16, 2021
@erikgrinaker erikgrinaker deleted the blathers/backport-release-21.2-71676 branch November 16, 2021 13:20
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
None yet
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

3 participants