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

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-8.5 This PR is cherry-picked to release-8.5 from a source PR. labels Dec 5, 2024
Copy link

codecov bot commented Dec 5, 2024

Codecov Report

All modified and coverable lines are covered by tests ✅

Please upload report for BASE (release-8.5@012bfdd). Learn more about missing BASE report.

Additional details and impacted files
@@               Coverage Diff                @@
##             release-8.5     #57997   +/-   ##
================================================
  Coverage               ?   56.8813%           
================================================
  Files                  ?       1772           
  Lines                  ?     626967           
  Branches               ?          0           
================================================
  Hits                   ?     356627           
  Misses                 ?     246180           
  Partials               ?      24160           
Flag Coverage Δ
integration 36.8348% <100.0000%> (?)
unit 72.5363% <100.0000%> (?)

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

Components Coverage Δ
dumpling 52.8711% <0.0000%> (?)
parser ∅ <0.0000%> (?)
br 52.2781% <0.0000%> (?)

Copy link

@yudongusa yudongusa left a comment

Choose a reason for hiding this comment

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

LGTM for cherrypick.

@ti-chi-bot ti-chi-bot bot added approved needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Dec 5, 2024
Copy link

ti-chi-bot bot commented Dec 5, 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 lgtm and removed needs-1-more-lgtm Indicates a PR needs 1 more LGTM. labels Dec 5, 2024
Copy link

ti-chi-bot bot commented Dec 5, 2024

[LGTM Timeline notifier]

Timeline:

  • 2024-12-05 02:56:08.645571731 +0000 UTC m=+1296356.265226246: ☑️ agreed by yudongusa.
  • 2024-12-05 03:01:02.281699279 +0000 UTC m=+1296649.901353795: ☑️ agreed by lcwangchao.

@ti-chi-bot ti-chi-bot bot added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Dec 5, 2024
@ti-chi-bot ti-chi-bot bot merged commit 2f9739a into pingcap:release-8.5 Dec 5, 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-8.5 This PR is cherry-picked to release-8.5 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants