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

gc_worker: fix deadlock in physicalScanAndResolveLocks (#16393) #16915

Merged
merged 8 commits into from
May 6, 2020

Conversation

sre-bot
Copy link
Contributor

@sre-bot sre-bot commented Apr 28, 2020

cherry-pick #16393 to release-4.0


Signed-off-by: youjiali1995 zlwgx1023@gmail.com

What problem does this PR solve?

Issue Number: close #16304

Problem Summary:
It's possible to block on channel sending in physicalScanAndResolveLocks when error occours.

What is changed and how it works?

What's Changed:
Check ctx.Done() when sending to a channel.

How it Works:

Related changes

  • Need to cherry-pick to the release branch

Check List

Tests

  • Integration test

Side effects

Release note

  • Fix the issue that GC worker blocks on channel sending forever when error occours.

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 28, 2020

/run-all-tests

Copy link
Contributor

@crazycs520 crazycs520 left a comment

Choose a reason for hiding this comment

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

LGTM

@youjiali1995 youjiali1995 added the status/can-merge Indicates a PR has been approved by a committer. label Apr 30, 2020
@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 30, 2020

Sorry @youjiali1995, you don't have permission to trigger auto merge event on this branch.

@youjiali1995 youjiali1995 modified the milestones: 4.0.0-rc.2, v4.0.0-ga Apr 30, 2020
@youjiali1995
Copy link
Contributor

@bb7133 Please merge it.

@jackysp
Copy link
Member

jackysp commented Apr 30, 2020

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 30, 2020

Your auto merge job has been accepted, waiting for:

  • 16948

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 30, 2020

/run-all-tests

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 30, 2020

@sre-bot merge failed.

@jackysp
Copy link
Member

jackysp commented Apr 30, 2020

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 30, 2020

/run-all-tests

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 30, 2020

@sre-bot merge failed.

@jackysp
Copy link
Member

jackysp commented Apr 30, 2020

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 30, 2020

Your auto merge job has been accepted, waiting for:

  • 16948

@jackysp
Copy link
Member

jackysp commented Apr 30, 2020

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 30, 2020

Your auto merge job has been accepted, waiting for:

  • 16948

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 30, 2020

/run-all-tests

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 30, 2020

/run-all-tests

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 30, 2020

@sre-bot merge failed.

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 30, 2020

/run-all-tests

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 30, 2020

@sre-bot merge failed.

@jackysp
Copy link
Member

jackysp commented Apr 30, 2020

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 30, 2020

/run-all-tests

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 30, 2020

@sre-bot merge failed.

@youjiali1995
Copy link
Contributor

/run-integration-copr-test

1 similar comment
@youjiali1995
Copy link
Contributor

/run-integration-copr-test

@jackysp
Copy link
Member

jackysp commented Apr 30, 2020

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 30, 2020

/run-all-tests

@sre-bot
Copy link
Contributor Author

sre-bot commented Apr 30, 2020

@sre-bot merge failed.

@jackysp
Copy link
Member

jackysp commented May 6, 2020

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented May 6, 2020

/run-all-tests

@jackysp
Copy link
Member

jackysp commented May 6, 2020

/rebuild

@sre-bot
Copy link
Contributor Author

sre-bot commented May 6, 2020

@sre-bot merge failed.

@jackysp
Copy link
Member

jackysp commented May 6, 2020

/merge

@sre-bot
Copy link
Contributor Author

sre-bot commented May 6, 2020

/run-all-tests

@sre-bot sre-bot merged commit 0dd4a08 into pingcap:release-4.0 May 6, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
component/GC status/can-merge Indicates a PR has been approved by a committer. 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.

4 participants