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: handle OOM panic which not be recovered now in distSQL layer #10544

Merged
merged 6 commits into from
May 20, 2019

Conversation

qw4990
Copy link
Contributor

@qw4990 qw4990 commented May 20, 2019

What problem does this PR solve?

In order to control memory consumption in distSQL layer, we let SelectResult and copWorker use MemTracker to trace and control their memory.
When memory consumption exceed the quota, MemTracker will panic but SelectResult and copWorker don't handle this panic rightly which may cause TiDB exit.

What is changed and how it works?

Add some recover statements to handle panic.

@qw4990 qw4990 changed the title distsql: handle OOM panic which not be recovered in distSQL layer distsql: handle OOM panic which not be recovered now in distSQL layer May 20, 2019
@qw4990
Copy link
Contributor Author

qw4990 commented May 20, 2019

/rebuild

@qw4990 qw4990 added sig/execution SIG execution type/bugfix This PR fixes a bug. labels May 20, 2019
@qw4990 qw4990 changed the title distsql: handle OOM panic which not be recovered now in distSQL layer executor: handle OOM panic which not be recovered now in distSQL layer May 20, 2019
@XuHuaiyu
Copy link
Contributor

/run-all-tests

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

@winkyao winkyao left a comment

Choose a reason for hiding this comment

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

LGTM

@winkyao winkyao added the priority/release-blocker This issue blocks a release. Please solve it ASAP. label May 20, 2019
@qw4990
Copy link
Contributor Author

qw4990 commented May 20, 2019

/run-all-tests

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
priority/release-blocker This issue blocks a release. Please solve it ASAP. sig/execution SIG execution type/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants