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

executor: return error when recover indexHash/MergeJoin worker #18509

Merged
merged 6 commits into from
Jul 14, 2020

Conversation

XuHuaiyu
Copy link
Contributor

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

  • Need to cherry-pick to the release branch

Check List

Tests

  • Integration test

Side effects

N/A

Release note

  • executor: return the OOM error when indexHashJoin worker panics

@XuHuaiyu XuHuaiyu requested a review from a team as a code owner July 13, 2020 08:54
@XuHuaiyu XuHuaiyu requested review from wshwsh12 and removed request for a team July 13, 2020 08:54
@@ -189,7 +190,9 @@ func (e *IndexNestedLoopHashJoin) startWorkers(ctx context.Context) {

func (e *IndexNestedLoopHashJoin) finishJoinWorkers(r interface{}) {
if r != nil {
logutil.BgLogger().Error("IndexNestedLoopHashJoin failed", zap.Error(errors.Errorf("%v", r)))
e.resultCh <- &indexHashJoinResult{
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Could you take a glance that if we have similar problems in other executors?

@XuHuaiyu XuHuaiyu requested a review from SunRunAway July 13, 2020 12:16
Copy link
Contributor

@SunRunAway SunRunAway left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-srebot ti-srebot added the status/LGT1 Indicates that a PR has LGTM 1. label Jul 13, 2020
@XuHuaiyu
Copy link
Contributor Author

/rebuild

@XuHuaiyu XuHuaiyu changed the title executor: return the error when recovering indexHashJoin worker executor: return the error when recovering indexHashJoin/indexMergeJoin worker Jul 14, 2020
@XuHuaiyu
Copy link
Contributor Author

/run-all-tests

@XuHuaiyu
Copy link
Contributor Author

/run-integration-copr-test

Copy link
Contributor

@lzmhhh123 lzmhhh123 left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

@ti-srebot ti-srebot removed the status/LGT1 Indicates that a PR has LGTM 1. label Jul 14, 2020
@ti-srebot ti-srebot added the status/LGT2 Indicates that a PR has LGTM 2. label Jul 14, 2020
@lzmhhh123
Copy link
Contributor

/merge

@ti-srebot ti-srebot added the status/can-merge Indicates a PR has been approved by a committer. label Jul 14, 2020
@ti-srebot
Copy link
Contributor

/run-all-tests

@ti-srebot
Copy link
Contributor

@XuHuaiyu merge failed.

@XuHuaiyu
Copy link
Contributor Author

/run-unit-test

@XuHuaiyu XuHuaiyu changed the title executor: return the error when recovering indexHashJoin/indexMergeJoin worker executor: return error when recover indexHash/MergeJoin worker Jul 14, 2020
@XuHuaiyu XuHuaiyu merged commit 30858ec into pingcap:master Jul 14, 2020
@XuHuaiyu XuHuaiyu deleted the index_hash_join_oom branch July 14, 2020 02:44
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Jul 14, 2020
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-srebot
Copy link
Contributor

cherry pick to release-4.0 in PR #18527

ti-srebot added a commit that referenced this pull request Jul 14, 2020
… (#18527)

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sig/execution SIG execution status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

memory-quota: inl_hash_join doesn't raise error when the usage of memory exceeds
4 participants