release-2.0: distsql: close merge joiner on error #30380
Merged
Conversation
This file contains 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
In two cases, the merge joiner was not calling `close()` after encountering an error. This could lead to it being endlessly `Next`ed by its consumer. Fixes cockroachdb#30363 Release note (bug fix): Fix potential infinite loop when the merge joiner encountered an error or cancellation.
|
This change is |
|
Is there a test we could add here to prevent a regression? |
|
A regression seems unlikely since this fix is only for release-2.0. It was fixed in 2.1 by f799885. |
solongordon
changed the title
rjnn
approved these changes
Sep 18, 2018
There was a problem hiding this comment.
LGTM 
Reviewed 1 of 1 files at r1.
Reviewable status:
|
Got it. It's unfortunate that we didn't have tests for these error cases. Hopefully after jordan's PR is in, error handling will become much simpler and easier to test. |
jordanlewis
approved these changes
Sep 18, 2018
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
In two cases, the merge joiner was not calling
close()afterencountering an error. This could lead to it being endlessly
Nexted byits consumer.
Fixes #30363
Release note (bug fix): Fix potential infinite loop when the merge
joiner encountered an error or cancellation.