release-20.1: bulkio: import no longer gets stuck due to errors encountered during import#50089
Merged
craig[bot] merged 2 commits intocockroachdb:release-20.1from Jun 12, 2020
Conversation
Member
|
This change is |
nvb
approved these changes
Jun 11, 2020
Fixes cockroachdb#49977 Parallel importer could get stuck due to a race between emitted import batches and checking for context cancellation (either due to an unforeseen error, or due to explicit context cancallation). Fix the race condition, and add tests verifying correct behavior. Release notes (bug fix): correctly handle import cancellation and errors.
e90ae53 to
f5eccf6
Compare
Contributor
Author
|
fyi @nvanbenschoten : trying to resolve merge issues due to the fact that types.XXX is no longer a pointer (on master). |
Fixes cockroachdb#49989 Correctly link data import producer and consumer when importing data. Using separate groups for producer and consumer could lead to a situation where consumer exits (due to an error, or explicit context cancellation), while producer does not realize that, leading to a deadlock. Release notes (bug fix): Correctly link producer/consumer during data import in order to handle errors correctly.
f5eccf6 to
92f3815
Compare
Contributor
Author
|
bors r+ |
Contributor
Build succeeded |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
3 participants
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:
Please see individual PRs for details.
/cc @cockroachdb/release