executor: return error when recover indexHash/MergeJoin worker (#18509) #18527
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
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
|
/run-all-tests |
SunRunAway
reviewed
Jul 14, 2020
executor/index_lookup_merge_join.go
Outdated
Comment on lines
304
to
312
| <<<<<<< HEAD | ||
| ======= | ||
| task := &lookUpMergeJoinTask{ | ||
| doneErr: errors.New(fmt.Sprintf("%v", r)), | ||
| results: make(chan *indexMergeJoinResult, numResChkHold), | ||
| } | ||
| close(task.results) | ||
| omw.resultCh <- task | ||
| >>>>>>> 30858ec... executor: return error when recover indexHash/MergeJoin worker (#18509) |
There was a problem hiding this comment.
Please resolve this conflict.
ti-srebot
added
status/LGT2
lzmhhh123
approved these changes
Jul 14, 2020
|
/merge |
ti-srebot
added
the
status/can-merge
|
/run-all-tests |
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.
cherry-pick #18509 to release-4.0
What problem does this PR solve?
Issue Number: close #18070
Problem Summary:
What is changed and how it works?
What's Changed:
return the OOM error when indexHashJoin worker panics
How it Works:
Related changes
Check List
Tests
Side effects
N/A
Release note