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: fix index join bug caused by innerWorker panic (#31563) #31615

Merged
merged 16 commits into from
Apr 14, 2022
Merged

executor: fix index join bug caused by innerWorker panic (#31563) #31615

merged 16 commits into from
Apr 14, 2022

Conversation

ti-srebot
Copy link
Contributor

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

cherry-pick #31563 to release-5.2
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/31615

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

git push git@github.com:ti-srebot/tidb.git pr/31615:release-5.2-82a75542e83f

What problem does this PR solve?

Issue Number: close #31494

Problem Summary:

  1. innerWorker panic because of OOM
  2. innerWorker call cancelFun(here)
  3. outerWorker didn't send task to resultCh, because it first push taskCh then resultCh, and because cancleFunc is called, so this task will not be send to main thread.
  4. outerWorker close resultCh
  5. main thread didn't get the task whose err is OOM

What is changed and how it works?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

Side effects

  • Performance regression: Consumes more CPU
  • Performance regression: Consumes more Memory
  • Breaking backward compatibility

Documentation

  • Affects user behaviors
  • Contains syntax changes
  • Contains variable changes
  • Contains experimental features
  • Changes MySQL compatibility

Release note

Fix index join bug caused by innerWorker panic

@guo-shaoge @ti-srebot
cherry pick pingcap#31563 to release-5.2
af8abc7 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • 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 12, 2022
@ti-srebot ti-srebot mentioned this pull request Jan 12, 2022
Merged
12 tasks
@ti-srebot ti-srebot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. type/5.2-cherry-pick labels Jan 12, 2022
@ti-srebot
Copy link
Contributor Author

@guo-shaoge you're already a collaborator in bot's repo.

@ti-chi-bot ti-chi-bot added size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Jan 12, 2022
@wshwsh12 wshwsh12 removed their request for review January 13, 2022 06:21
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Apr 11, 2022
@guo-shaoge
fix conflict
2359944 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XL Denotes a PR that changes 500-999 lines, ignoring generated files. labels Apr 12, 2022
@guo-shaoge
Copy link
Collaborator

/run-all-tests

@guo-shaoge
Copy link
Collaborator

/run-unit-test

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 13, 2022
@guo-shaoge
Copy link
Collaborator

/hold

@ti-chi-bot ti-chi-bot added the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 14, 2022
@guo-shaoge
reduce inserted rows to avoid case run too long
0e5f918 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Apr 14, 2022
@guo-shaoge
Copy link
Collaborator

/run-unit-test

@sre-bot
Copy link
Contributor

sre-bot commented Apr 14, 2022 •
edited
Loading

Code Coverage Details: https://codecov.io/github/pingcap/tidb/commit/cf2ad9110a47bdc71c2b2317812fb73277a2d5e6

@guo-shaoge
Copy link
Collaborator

/unhold
/merge

@ti-chi-bot ti-chi-bot removed the do-not-merge/hold Indicates that a PR should not merge because someone has issued a /hold command. label Apr 14, 2022
@ti-chi-bot
Copy link
Member

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

Commit hash: b4ccc4c

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 14, 2022
@guo-shaoge
Copy link
Collaborator

/run-unit-test

2 similar comments
@guo-shaoge
Copy link
Collaborator

/run-unit-test

@guo-shaoge
Copy link
Collaborator

/run-unit-test

@guo-shaoge
restore config in defer
b40fbdf 
Signed-off-by: guo-shaoge <shaoge1994@163.com>
@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label Apr 14, 2022
@guo-shaoge
Copy link
Collaborator

/run-mysql-test
/run-unit-test

@guo-shaoge
Copy link
Collaborator

/run-unit-test

@guo-shaoge
Copy link
Collaborator

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 73efc62

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 14, 2022
@guo-shaoge
Copy link
Collaborator

/run-unit-test

@ti-chi-bot ti-chi-bot merged commit 5659b7d into pingcap:release-5.2 Apr 14, 2022
@zhouqiang-cl zhouqiang-cl added this to the v5.2.4 milestone Apr 18, 2022
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

@wshwsh12 wshwsh12 wshwsh12 approved these changes

Assignees

@guo-shaoge guo-shaoge

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. size/M Denotes a PR that changes 30-99 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/5.2-cherry-pick
Projects
None yet
Milestone
v5.2.4
Development

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