Skip to content

util: add lock for MergeBasicStats#38998

Merged
ti-chi-bot merged 3 commits intopingcap:masterfrom
mengxin9014:mx/addLockForMergeBasicStats
Nov 10, 2022
Merged

util: add lock for MergeBasicStats#38998
ti-chi-bot merged 3 commits intopingcap:masterfrom
mengxin9014:mx/addLockForMergeBasicStats

Conversation

@mengxin9014
Copy link
Contributor

@mengxin9014 mengxin9014 commented Nov 9, 2022 •
edited
Loading

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

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

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • hawkingrei
  • wshwsh12

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 added 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. do-not-merge/needs-triage-completed labels Nov 9, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 9, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Indicates that a PR has LGTM 2. needs-cherry-pick-release-6.4 and removed status/LGT1 Indicates that a PR has LGTM 1. do-not-merge/needs-triage-completed labels Nov 9, 2022
@hawkingrei
Copy link
Member

hawkingrei commented Nov 10, 2022

/merge

@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 10, 2022

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

DetailsCommit hash: 95b20e7

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 10, 2022
@ti-chi-bot ti-chi-bot merged commit d970c9b into pingcap:master Nov 10, 2022
@ti-chi-bot ti-chi-bot mentioned this pull request Nov 10, 2022
Merged
12 tasks
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Nov 10, 2022

In response to a cherrypick label: new pull request created: #39040.

@sre-bot
Copy link
Contributor

sre-bot commented Nov 10, 2022

TiDB MergeCI notify

🔴 Bad News! [2] CI still failing after this pr merged.
These failed integration tests don't seem to be introduced by the current PR.

CI Name Result Duration Compare with Parent commit
idc-jenkins-ci-tidb/integration-ddl-test 🔴 failed 1, success 5, total 6 48 min Existing failure
idc-jenkins-ci-tidb/mybatis-test 🔴 failed 1, success 0, total 1 16 min Existing failure
idc-jenkins-ci/integration-cdc-test 🟢 all 39 tests passed 28 min Existing passed
idc-jenkins-ci-tidb/tics-test 🟢 all 1 tests passed 20 min Existing passed
idc-jenkins-ci-tidb/integration-common-test 🟢 all 17 tests passed 20 min Existing passed
idc-jenkins-ci-tidb/common-test 🟢 all 11 tests passed 12 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-2 🟢 all 28 tests passed 10 min Existing passed
idc-jenkins-ci-tidb/sqllogic-test-1 🟢 all 26 tests passed 7 min 34 sec Existing passed
idc-jenkins-ci-tidb/integration-compatibility-test 🟢 all 1 tests passed 6 min 56 sec Existing passed
idc-jenkins-ci-tidb/plugin-test 🟢 build success, plugin test success 4min Existing passed

ti-chi-bot added a commit that referenced this pull request Nov 11, 2022
@ti-chi-bot
util: add lock for MergeBasicStats (#38998) (#39040)
bee9915 
close #38994
mengxin9014 added a commit to mengxin9014/tidb that referenced this pull request Nov 12, 2022
@mengxin9014
Revert "util: add lock for MergeBasicStats (pingcap#38998)"
c11ab16 
This reverts commit d970c9b.
ti-chi-bot pushed a commit to ti-chi-bot/tidb that referenced this pull request Nov 13, 2022
@mengxin9014 @ti-chi-bot
Revert "util: add lock for MergeBasicStats (pingcap#38998)"
5c8655d 
This reverts commit d970c9b.
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

@wshwsh12 wshwsh12 wshwsh12 approved these changes

Assignees

No one assigned

Labels

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.

tidb occurred fatal error: concurrent map iteration

5 participants

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