Skip to content

util: add lock for MergeBasicStats (#38998)#39040

Merged
ti-chi-bot merged 2 commits intopingcap:release-6.4from
ti-chi-bot:cherry-pick-38998-to-release-6.4
Nov 11, 2022
Merged

util: add lock for MergeBasicStats (#38998)#39040
ti-chi-bot merged 2 commits intopingcap:release-6.4from
ti-chi-bot:cherry-pick-38998-to-release-6.4

Conversation

@ti-chi-bot
Copy link
Member

@ti-chi-bot ti-chi-bot commented Nov 10, 2022

This is an automated cherry-pick of #38998

What problem does this PR solve?

Issue Number: close #38994

Problem Summary:

What is changed and how it works?

Fix panic cause by concurrent map iteration and write in memory usage alarm by adding lock for MergeBasicStats

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

Please refer to Release Notes Language Style Guide to write a quality release note.

add lock for MergeBasicStats.

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Nov 10, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • XuHuaiyu
  • hawkingrei

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.

Details

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 mentioned this pull request Nov 10, 2022
Merged
12 tasks
@ti-chi-bot ti-chi-bot added do-not-merge/cherry-pick-not-approved release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. type/cherry-pick-for-release-6.4 labels Nov 10, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 11, 2022
@sre-bot sre-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 11, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. and removed status/LGT1 Indicates that a PR has LGTM 1. labels Nov 11, 2022
@hawkingrei
Copy link
Member

hawkingrei commented Nov 11, 2022

/merge

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Nov 11, 2022

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

DetailsCommit hash: 55922fa

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 11, 2022
@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Nov 11, 2022

@ti-chi-bot: Your PR was out of date, I have automatically updated it for you.

At the same time I will also trigger all tests for you:

/run-all-tests

If the CI test fails, you just re-trigger the test that failed and the bot will merge the PR for you after the CI passes.

Details

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 ti-community-infra/tichi repository.

@ti-chi-bot ti-chi-bot merged commit bee9915 into pingcap:release-6.4 Nov 11, 2022
@ti-chi-bot ti-chi-bot deleted the cherry-pick-38998-to-release-6.4 branch April 15, 2025 08:05
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Reviewers

@hawkingrei hawkingrei hawkingrei approved these changes

@XuHuaiyu XuHuaiyu XuHuaiyu approved these changes

Assignees

@mengxin9014 mengxin9014

Labels

cherry-pick-approved Cherry pick PR approved by release team. release-note Denotes a PR that will be considered when it comes time to generate release notes. size/XS Denotes a PR that changes 0-9 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

Milestone

No milestone

Development

Successfully merging this pull request may close these issues.

5 participants

@ti-chi-bot @hawkingrei @XuHuaiyu @mengxin9014 @sre-bot