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 goroutine leak in querying slow log (#32757) #32780

Merged
merged 6 commits into from
Apr 15, 2022
Merged

executor: fix goroutine leak in querying slow log (#32757) #32780

merged 6 commits into from
Apr 15, 2022

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 3, 2022 •
edited
Loading

cherry-pick #32757 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/32780

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

git push git@github.com:ti-srebot/tidb.git pr/32780:release-5.2-62ec7468e738

What problem does this PR solve?

Issue Number: close #32656

Problem Summary:

goroutine leaks in parseSlowLog when the query is canceled.

What is changed and how it works?

Check context when waiting for the channel.

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

None

@djshow832 @ti-srebot
cherry pick pingcap#32757 to release-5.2
d84391c 
Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 3, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • crazycs520
  • hawkingrei

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-none Denotes a PR that doesn't merit a release note. 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 Mar 3, 2022
@ti-srebot ti-srebot mentioned this pull request Mar 3, 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 Mar 3, 2022
@ti-srebot
Copy link
Contributor Author

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

@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
@ti-chi-bot ti-chi-bot added size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. and removed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Apr 15, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 15, 2022
@djshow832 djshow832 force-pushed the release-5.2-62ec7468e738 branch from 8d2f5b7 to d84391c Compare April 15, 2022 06:48
@ti-chi-bot ti-chi-bot added size/M Denotes a PR that changes 30-99 lines, ignoring generated files. and removed size/XXL Denotes a PR that changes 1000+ lines, ignoring generated files. labels Apr 15, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Apr 15, 2022 •
edited
Loading

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

@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 Apr 15, 2022
@winoros
Copy link
Member

winoros commented Apr 15, 2022

/merge

@ti-chi-bot
Copy link
Member

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

Commit hash: 6429d86

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 15, 2022
@winoros
Copy link
Member

winoros commented Apr 15, 2022

/run-unit-test

@winoros
Copy link
Member

winoros commented Apr 15, 2022

/merge

@winoros
Copy link
Member

winoros commented Apr 15, 2022

/run-mysql-test

@winoros
Copy link
Member

winoros commented Apr 15, 2022

/run-mysql-test tidb-test=pr/1663

@winoros
Copy link
Member

winoros commented Apr 15, 2022

/merge

@ti-chi-bot ti-chi-bot merged commit 79db6f5 into pingcap:release-5.2 Apr 15, 2022
@winoros winoros deleted the release-5.2-62ec7468e738 branch April 15, 2022 09:55
@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

@hawkingrei hawkingrei hawkingrei approved these changes

@crazycs520 crazycs520 crazycs520 approved these changes

Assignees

@djshow832 djshow832

Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. 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.
9 participants
@ti-srebot @ti-chi-bot @sre-bot @winoros @hawkingrei @crazycs520 @VelocityLight @zhouqiang-cl @djshow832