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: fix the forever hang in index merge join ... (#17435) #17654

Merged
merged 5 commits into from
Jun 5, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Jun 4, 2020

cherry-pick #17435 to release-4.0


What problem does this PR solve?

Issue Number: close #17394
Problem Summary: As the title says.

What is changed and how it works?

What's Changed: close the results channel for the panic inner task.

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Unit test
  • Integration test

Side effects

  • Performance regression
    • Consumes more CPU

Release note

  • fix the forever hang in index merge join when oom occurs

Signed-off-by: sre-bot <sre-bot@pingcap.com>
@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 4, 2020

/run-all-tests

@lzmhhh123
Copy link
Contributor

/rebuild

@lzmhhh123
Copy link
Contributor

/run-check_dev

Copy link
Contributor

@XuHuaiyu XuHuaiyu left a comment

Choose a reason for hiding this comment

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

LGTM

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

@zz-jason zz-jason removed their request for review June 5, 2020 03:34
@zz-jason zz-jason added status/LGT2 Indicates that a PR has LGTM 2. status/can-merge Indicates a PR has been approved by a committer. labels Jun 5, 2020
@SunRunAway
Copy link
Contributor

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 5, 2020

/run-all-tests

@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 5, 2020

@sre-bot merge failed.

@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 5, 2020

/run-all-tests

@sre-bot
Copy link
Contributor Author

sre-bot commented Jun 5, 2020

@sre-bot merge failed.

@lzmhhh123
Copy link
Contributor

/run-check_dev
/run-unit-test
/run-common-test

@lzmhhh123
Copy link
Contributor

/run-common-test

@zz-jason zz-jason changed the title executor: fix the forever hang in index merge join when oom occurs (#17435) executor: fix the forever hang in index merge join ... (#17435) Jun 5, 2020
@zz-jason zz-jason merged commit 9276d76 into pingcap:release-4.0 Jun 5, 2020
@bb7133 bb7133 modified the milestones: v4.0.1, v4.0.2 Jun 6, 2020
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. type/bugfix This PR fixes a bug. type/4.0-cherry-pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants