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: recover panic in executor.Close() #49222

Merged
merged 6 commits into from
Dec 12, 2023
Merged

executor: recover panic in executor.Close() #49222

merged 6 commits into from
Dec 12, 2023

Conversation

wshwsh12
Copy link
Contributor

@wshwsh12 wshwsh12 commented Dec 6, 2023 •
edited
Loading

What problem does this PR solve?

Issue Number: close #49223

Problem Summary:
Prevent potential goroutine leaks.

In UnionExec.Close(), if there is a panic during closing the first child executor, the second executor will not closed.
And the same is true in BaseExecutor.Close().

What changed and how does it work?

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No need to test
    • I checked and no code files have been changed.

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

Please refer to Release Notes Language Style Guide to write a quality release note.

None

@ti-chi-bot ti-chi-bot bot added do-not-merge/needs-linked-issue release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files. labels Dec 6, 2023
@tiprow tiprow
Copy link

tiprow bot commented Dec 6, 2023

Hi @wshwsh12. Thanks for your PR.

PRs from untrusted users cannot be marked as trusted with /ok-to-test in this repo meaning untrusted PR authors can never trigger tests themselves. Collaborators can still trigger tests on the PR using /test all.

I understand the commands that are listed here.

Instructions for interacting with me using PR comments are available here. If you have questions or suggestions related to my behavior, please file an issue against the kubernetes/test-infra repository.

@codecov Codecov
Copy link

codecov bot commented Dec 6, 2023 •
edited
Loading

Codecov Report

Merging #49222 (21384a5) into master (45b4e4a) will increase coverage by 0.8393%.
Report is 1 commits behind head on master.
The diff coverage is 57.1428%.

Additional details and impacted files 
@@               Coverage Diff                @@
##             master     #49222        +/-   ##
================================================
+ Coverage   71.0515%   71.8908%   +0.8392%     
================================================
  Files          1368       1412        +44     
  Lines        401638     414171     +12533     
================================================
+ Hits         285370     297751     +12381     
- Misses        96426      97620      +1194     
+ Partials      19842      18800      -1042
Flag Coverage Δ
integration 43.6495% <57.1428%> (?)
unit 71.0520% <ø> (+0.0004%) ⬆️

Flags with carried forward coverage won't be shown. Click here to find out more.

Components Coverage Δ
dumpling 53.9663% <ø> (ø)
parser ∅ <ø> (∅)
br 47.9211% <ø> (-4.9723%) ⬇️

XuHuaiyu
XuHuaiyu reviewed Dec 6, 2023
View reviewed changes
pkg/executor/cte_test.go
err := tk.ExecToErr(sql)
require.NotNil(t, err)
require.Equal(t, "[executor:8175]Your query has been cancelled due to exceeding the allowed memory limit for a single SQL query. Please try narrowing your query scope or increase the tidb_mem_quota_query limit and try again.[conn=%d]", err.Error())
tk.MustExec(sql) // No deadlock
Copy link
Contributor

Choose a reason for hiding this comment

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

Why change this?

Copy link
Contributor Author

@wshwsh12 wshwsh12 Dec 6, 2023 •
edited
Loading

Choose a reason for hiding this comment

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

The error occurs in the Close() function, we should only log it and don't return to client.

@hawkingrei
Copy link
Member

/ok-to-test

@ti-chi-bot ti-chi-bot bot added the ok-to-test Indicates a PR is ready to be tested. label Dec 6, 2023
@ti-chi-bot ti-chi-bot bot added the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 8, 2023
@ti-chi-bot ti-chi-bot bot removed the needs-rebase Indicates a PR cannot be merged because it has merge conflicts with HEAD. label Dec 11, 2023
@ti-chi-bot ti-chi-bot bot added needs-1-more-lgtm Indicates a PR needs 1 more LGTM. approved labels Dec 12, 2023
AilinKid
AilinKid reviewed Dec 12, 2023
View reviewed changes
Copy link
Contributor

@AilinKid AilinKid left a comment

Choose a reason for hiding this comment

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

/LGTM

@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 12, 2023

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: AilinKid, XuHuaiyu

The full list of commands accepted by this bot can be found here.

The pull request process is described here

Needs approval from an approver in each of these files:

Approvers can indicate their approval by writing /approve in a comment
Approvers can cancel approval by writing /approve cancel in a comment

@ti-chi-bot ti-chi-bot bot added lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Dec 12, 2023
@ti-chi-bot ti-chi-bot
Copy link

ti-chi-bot bot commented Dec 12, 2023

[LGTM Timeline notifier]

Timeline:

  • 2023-12-12 10:18:26.259843905 +0000 UTC m=+351397.297070825: ☑️ agreed by XuHuaiyu.
  • 2023-12-12 10:38:08.624297352 +0000 UTC m=+352579.661524278: ☑️ agreed by AilinKid.

@hawkingrei
Copy link
Member

/retest

@ti-chi-bot ti-chi-bot bot merged commit 80c6fc1 into pingcap:master Dec 12, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@AilinKid AilinKid AilinKid left review comments

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

@guo-shaoge guo-shaoge Awaiting requested review from guo-shaoge

Assignees
No one assigned
Labels
approved lgtm ok-to-test Indicates a PR is ready to be tested. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 lines, ignoring generated files.
Projects
None yet
Milestone
No milestone
Development

Successfully merging this pull request may close these issues.

Potential goroutine leaks in Executor.Close() function
4 participants
@wshwsh12 @hawkingrei @XuHuaiyu @AilinKid