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

statistics: fix data race in HandleUpdateStats #33260

Merged
merged 3 commits into from
Mar 25, 2022

Conversation

xuyifangreeneyes
Copy link
Contributor

@xuyifangreeneyes xuyifangreeneyes commented Mar 20, 2022

What problem does this PR solve?

Issue Number: close #33108 #32867 #33001

Problem Summary:
HandleUpdateStats calls h.mu.ctx.(sqlexec.SQLExecutor).ExecuteInternal without h.mu.Lock(), which causes data race.

What is changed and how it works?

Use h.execRestrictedSQL to execute sql.

Check List

Tests

  • Unit test
  • Integration test
  • Manual test (add detailed scripts or steps below)
  • No code

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

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 20, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • time-and-fate
  • winoros

To complete the pull request process, please ask the reviewers in the list to review by filling /cc @reviewer in the comment.
After your PR has acquired the required number of LGTMs, you can assign this pull request to the committer in the list by filling /assign @committer in the comment to help you merge this pull request.

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

Reviewer can indicate their review by submitting an approval review.
Reviewer can cancel approval by submitting a request changes review.

@ti-chi-bot ti-chi-bot added release-note-none Denotes a PR that doesn't merit a release note. do-not-merge/needs-triage-completed size/M Denotes a PR that changes 30-99 lines, ignoring generated files. labels Mar 20, 2022
@sre-bot
Copy link
Contributor

sre-bot commented Mar 20, 2022

@xuyifangreeneyes
Copy link
Contributor Author

/cc @winoros @time-and-fate

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Mar 23, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. needs-cherry-pick-6.0 and removed status/LGT1 Indicates that a PR has LGTM 1. do-not-merge/needs-triage-completed labels Mar 24, 2022
@hawkingrei
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

This pull request has been accepted and is ready to merge.

Commit hash: 089f4d9

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Mar 25, 2022
@ti-chi-bot ti-chi-bot merged commit 9b9051f into pingcap:master Mar 25, 2022
ti-srebot pushed a commit to ti-srebot/tidb that referenced this pull request Mar 25, 2022
@ti-srebot
Copy link
Contributor

cherry pick to release-6.0 in PR #33444

@xuyifangreeneyes xuyifangreeneyes deleted the fix-33108 branch March 25, 2022 14:27
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
release-note-none Denotes a PR that doesn't merit a release note. size/M Denotes a PR that changes 30-99 lines, ignoring generated files. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

(*Handle).HandleUpdateStats can trigger data race
7 participants