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

*: avoid unlock of unlocked mutex panic on TableDeltaMap (#57799) #59063

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #57799

What problem does this PR solve?

Issue Number: close #57798

Problem Summary:

What changed and how does it work?

It's most likely that unlock of unlocked mutex is caused by the struct assignment that overwrite the mutex field.

goroutine1:
mu.Lock()
                                                            goroutine2:
                                                            mu = &struct{ }   
defer mu.Unlock()                              <- unlock of unlocked mutex

The old code is weird, tdmLock is used to protect TableDeltaMap but it's not goes together with TableDeltaMap.

I wrap TableDeltaMap into a struct and provide Clone() and Visit() function to it.

Just tiny workaround!

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.

Some kind of data race, not easy to check in the unit test way

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 requested a review from a team as a code owner January 21, 2025 03:38
@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR. labels Jan 21, 2025
Copy link

codecov bot commented Jan 21, 2025

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (release-6.5@e9a1f7f). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-6.5     #59063   +/-   ##
================================================
  Coverage               ?   73.6288%           
================================================
  Files                  ?       1097           
  Lines                  ?     353048           
  Branches               ?          0           
================================================
  Hits                   ?     259945           
  Misses                 ?      76370           
  Partials               ?      16733           

@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Feb 7, 2025
@ti-chi-bot ti-chi-bot bot added the lgtm label Feb 7, 2025
Copy link

ti-chi-bot bot commented Feb 7, 2025

[APPROVALNOTIFIER] This PR is APPROVED

This pull-request has been approved by: lcwangchao, tiancaiamao

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 [lcwangchao,tiancaiamao]

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 removed the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Feb 7, 2025
Copy link

ti-chi-bot bot commented Feb 7, 2025

[LGTM Timeline notifier]

Timeline:

  • 2025-02-07 02:34:44.822428865 +0000 UTC m=+411956.354840848: ☑️ agreed by lcwangchao.
  • 2025-02-07 08:52:34.875940509 +0000 UTC m=+997.272162571: ☑️ agreed by tiancaiamao.

@ti-chi-bot ti-chi-bot bot merged commit b5c86f5 into pingcap:release-6.5 Feb 7, 2025
10 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/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-6.5 This PR is cherry-picked to release-6.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants