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) #58122

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 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-7.5 This PR is cherry-picked to release-7.5 from a source PR. labels Dec 10, 2024
@tiancaiamao
Copy link
Contributor

/test unit-test

Copy link

tiprow bot commented Dec 10, 2024

@tiancaiamao: No presubmit jobs available for pingcap/tidb@release-7.5

In response to this:

/test unit-test

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-sigs/prow repository.

@ti-chi-bot ti-chi-bot bot added the needs-1-more-lgtm Indicates a PR needs 1 more LGTM. label Dec 10, 2024
Copy link

codecov bot commented Dec 10, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (release-7.5@b298e21). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-7.5     #58122   +/-   ##
================================================
  Coverage               ?   72.2278%           
================================================
  Files                  ?       1415           
  Lines                  ?     413291           
  Branches               ?          0           
================================================
  Hits                   ?     298511           
  Misses                 ?      94840           
  Partials               ?      19940           
Flag Coverage Δ
unit 72.2278% <100.0000%> (?)

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

Components Coverage Δ
dumpling 52.9400% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 53.5605% <0.0000%> (?)

Copy link

ti-chi-bot bot commented Dec 10, 2024

[APPROVALNOTIFIER] This PR is APPROVED

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

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

ti-chi-bot bot commented Dec 10, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-12-10 10:02:22.750623107 +0000 UTC m=+346332.839425647: ☑️ agreed by lcwangchao.
  • 2024-12-10 16:30:36.483606413 +0000 UTC m=+369626.572408956: ☑️ agreed by yudongusa.

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

Successfully merging this pull request may close these issues.

4 participants