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.

Sign up for GitHub

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

Jump to bottom

executor: return error as expected when indexHashJoin occur error or panic in handleTask (#31323) #31446

Merged
merged 3 commits into from
Feb 9, 2022
Merged

executor: return error as expected when indexHashJoin occur error or panic in handleTask (#31323) #31446

merged 3 commits into from
Feb 9, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Jan 7, 2022 •
edited
Loading

cherry-pick #31323 to release-5.1
You can switch your code base to this Pull Request by using git-extras:

# In tidb repo:
git pr https://github.com/pingcap/tidb/pull/31446

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tidb.git pr/31446:release-5.1-c27f8f697fc5

What problem does this PR solve?

Issue Number: close #31129

Problem Summary:

What is changed and how it works?

As the description in #31129 mentioned.
And another bug is also fixed in this commit: when panic happen in handleHashJoinInnerWorkerPanic, error can not be returned successfully if keepOrder is true.

Check List

Tests

  • Integration test

Side effects

N/A

Documentation
N/A

Release note

Fix the bug that indexHashJoin may return the error `send on closed channel`.

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Jan 7, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • guo-shaoge
  • wshwsh12

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

The full list of commands accepted by this bot can be found here.

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-srebot
Copy link
Contributor Author

/run-all-tests

@ti-chi-bot ti-chi-bot added do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. release-note Denotes a PR that will be considered when it comes time to generate release notes. and removed do-not-merge/release-note-label-needed Indicates that a PR should not merge because it's missing one of the release note labels. labels Jan 7, 2022
@ti-srebot ti-srebot mentioned this pull request Jan 7, 2022
Merged
1 task
@ti-srebot ti-srebot added sig/execution SIG execution size/L Denotes a PR that changes 100-499 lines, ignoring generated files. type/5.1-cherry-pick type/bugfix This PR fixes a bug. labels Jan 7, 2022
@ti-srebot
Copy link
Contributor Author

@XuHuaiyu you're already a collaborator in bot's repo.

@wshwsh12 wshwsh12 removed their request for review January 11, 2022 06:52
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Jan 24, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Feb 8, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Feb 9, 2022
@wshwsh12
Copy link
Contributor

wshwsh12 commented Feb 9, 2022

Please fix the CI.

@bb7133
Copy link
Member

bb7133 commented Feb 9, 2022

/run-check_dev

@XuHuaiyu
Copy link
Contributor

XuHuaiyu commented Feb 9, 2022

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: cb3bb72

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Feb 9, 2022
@XuHuaiyu
Copy link
Contributor

XuHuaiyu commented Feb 9, 2022

/merge

@XuHuaiyu
Copy link
Contributor

XuHuaiyu commented Feb 9, 2022

/run-check_dev

@ti-chi-bot ti-chi-bot merged commit 669f37e into pingcap:release-5.1 Feb 9, 2022
@zhouqiang-cl zhouqiang-cl added this to the v5.1.4 milestone Feb 10, 2022
XuHuaiyu pushed a commit to ti-srebot/tidb that referenced this pull request Feb 22, 2022
@ti-srebot @XuHuaiyu
executor: return error as expected when indexHashJoin occur error or …
adb747f 
…panic in handleTask (pingcap#31323) (pingcap#31446)

close pingcap#31129
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@guo-shaoge guo-shaoge guo-shaoge approved these changes

@wshwsh12 wshwsh12 wshwsh12 approved these changes

Assignees

@XuHuaiyu XuHuaiyu

Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. sig/execution SIG execution size/L Denotes a PR that changes 100-499 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/bugfix This PR fixes a bug. type/5.1-cherry-pick
Projects
None yet
Milestone
v5.1.4
Development

Successfully merging this pull request may close these issues.
8 participants
@ti-srebot @ti-chi-bot @wshwsh12 @bb7133 @XuHuaiyu @guo-shaoge @VelocityLight @zhouqiang-cl