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 tidb crash when calling Close and Finish (#54390) #54416

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #54390

What problem does this PR solve?

Issue Number: close #54335

Problem Summary: ref #52882

What changed and how does it work?

  1. Move the finishLock to tidbResultSet to protect Close() and Finish().
  2. Clear SQLKiller.Finish() when writeResultSet finished.
Bug Analyze:
interface:resultSet.ResultSet           -> {RecordSet}       -> {RecordSet}
struct   :tidbResultSet                 -> execStmtResult   -> recordSet

calling chain:

main goroutine: tidbResultSet.Close  ->  execStmtResultSet.Close  ->  execStmtResultSet.Finish() 
                                                                 ->  recordSet.Close                -> recordSet.Finish()
                                                                                                    -> recordSet.CleanWork
                                                                 ->  execStmtResultSet.CleanWork
                                     -> tidbResultSet.CleanWork(race)


kill goroutine: tidbResultSet.Finish(race) ->  execStmtResultSet.Finish ->  recordSet.Finish

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 added 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. type/cherry-pick-for-release-8.2 labels Jul 3, 2024
Copy link

ti-chi-bot bot commented Jul 3, 2024

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: guo-shaoge, 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:
  • OWNERS [XuHuaiyu,guo-shaoge]

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 approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Jul 3, 2024
Copy link

ti-chi-bot bot commented Jul 3, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-07-03 09:44:37.68535544 +0000 UTC m=+1404004.170844265: ☑️ agreed by guo-shaoge.
  • 2024-07-03 09:44:40.758093182 +0000 UTC m=+1404007.243582011: ☑️ agreed by XuHuaiyu.

@ti-chi-bot ti-chi-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Jul 3, 2024
@ti-chi-bot ti-chi-bot added cherry-pick-approved Cherry pick PR approved by release team. and removed cherry-pick-approved Cherry pick PR approved by release team. labels Jul 3, 2024
Copy link

codecov bot commented Jul 3, 2024

Codecov Report

Attention: Patch coverage is 92.50000% with 3 lines in your changes missing coverage. Please review.

Please upload report for BASE (release-8.2@e211099). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-8.2     #54416   +/-   ##
================================================
  Coverage               ?   55.8684%           
================================================
  Files                  ?       1639           
  Lines                  ?     606826           
  Branches               ?          0           
================================================
  Hits                   ?     339024           
  Misses                 ?     244587           
  Partials               ?      23215           
Flag Coverage Δ
integration 36.8387% <87.5000%> (?)
unit 71.7989% <92.5000%> (?)

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

Components Coverage Δ
dumpling 52.9656% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 52.7187% <0.0000%> (?)

@ti-chi-bot ti-chi-bot bot merged commit ae83818 into pingcap:release-8.2 Jul 3, 2024
18 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
approved cherry-pick-approved Cherry pick PR approved by release team. lgtm 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. type/cherry-pick-for-release-8.2
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants