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.

Sign up for GitHub

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

Jump to bottom

resource_control: fix data race in controller #7520

Merged
merged 2 commits into from
Dec 11, 2023
Merged

resource_control: fix data race in controller #7520

merged 2 commits into from
Dec 11, 2023

Conversation

nolouch
Copy link
Contributor

@nolouch nolouch commented Dec 11, 2023 •
edited by CabinfeverB
Loading

What problem does this PR solve?

Issue Number: close #4399 close pingcap/tidb#49311

What is changed and how does it work?

the meta information is not safe to visit concurrency
- address the data race condition

Check List

Tests

  • Integration test
None.

resource_control: fix data race in controller
1e90086 
Signed-off-by: Shuning Chen <nolouch@ShuningdeMacBook-Pro.local>
@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Dec 11, 2023 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CabinfeverB
  • JmPotato

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 bot requested review from JmPotato and Yisaer December 11, 2023 06:36
@ti-chi-bot ti-chi-bot bot added the size/XS Denotes a PR that changes 0-9 lines, ignoring generated files. label Dec 11, 2023
@ti-chi-bot ti-chi-bot bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 11, 2023
@nolouch
Copy link
Contributor Author

nolouch commented Dec 11, 2023

ptal @CabinfeverB @glorv

@codecov Codecov
Copy link

codecov bot commented Dec 11, 2023 •
edited
Loading

Codecov Report

Merging #7520 (1e90086) into master (ab68192) will increase coverage by 0.14%.
The diff coverage is 100.00%.

❗ Current head 1e90086 differs from pull request most recent head 32406f7. Consider uploading reports for the commit 32406f7 to get more accurate results

Additional details and impacted files 
@@            Coverage Diff             @@
##           master    #7520      +/-   ##
==========================================
+ Coverage   74.45%   74.59%   +0.14%     
==========================================
  Files         453      452       -1     
  Lines       50037    49970      -67     
==========================================
+ Hits        37253    37275      +22     
+ Misses       9451     9379      -72     
+ Partials     3333     3316      -17
Flag Coverage Δ
unittests 74.59% <100.00%> (+0.14%) ⬆️

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

@ti-chi-bot ti-chi-bot bot added status/LGT2 Indicates that a PR has LGTM 2. needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. and removed status/LGT1 Indicates that a PR has LGTM 1. do-not-merge/needs-linked-issue do-not-merge/needs-triage-completed labels Dec 11, 2023
glorv
glorv approved these changes Dec 11, 2023
View reviewed changes
Copy link
Contributor

@glorv glorv left a comment

Choose a reason for hiding this comment

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

LGTM

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Dec 11, 2023

@glorv: Thanks for your review. The bot only counts approvals from reviewers and higher roles in list, but you're still welcome to leave your comments.

In response to this:

LGTM

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.

@nolouch
Copy link
Contributor Author

nolouch commented Dec 11, 2023

/merge

@ti-chi-bot ti-chi-bot
Copy link
Contributor

ti-chi-bot bot commented Dec 11, 2023

@nolouch: It seems you want to merge this PR, I will help you trigger all the tests:

/run-all-tests

You only need to trigger /merge once, and 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.

If you have any questions about the PR merge process, please refer to pr process.

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
Copy link
Contributor

ti-chi-bot bot commented Dec 11, 2023

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

Commit hash: 32406f7

@ti-chi-bot ti-chi-bot bot added the status/can-merge Indicates a PR has been approved by a committer. label Dec 11, 2023
@ti-chi-bot ti-chi-bot bot merged commit fcdeec4 into tikv:master Dec 11, 2023
22 checks passed
@ti-chi-bot
Copy link
Member

In response to a cherrypick label: new pull request created to branch release-7.5: #7526.

ti-chi-bot pushed a commit to ti-chi-bot/pd that referenced this pull request Dec 11, 2023
@nolouch @ti-chi-bot
This is an automated cherry-pick of tikv#7520
34a49de 
close tikv#4399, ref pingcap/tidb#49311

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
@ti-chi-bot ti-chi-bot mentioned this pull request Dec 11, 2023
Merged
@nolouch nolouch deleted the fix-race branch December 11, 2023 09:09
ti-chi-bot bot pushed a commit that referenced this pull request Dec 13, 2023
@ti-chi-bot @nolouch
resource_control: fix data race in controller (#7520) (#7526)
d2074a9 
close #4399, ref pingcap/tidb#49311

the meta information is not safe to visit concurrency
- address the data race condition

Signed-off-by: ti-chi-bot <ti-community-prow-bot@tidb.io>
Signed-off-by: nolouch <nolouch@gmail.com>

Co-authored-by: ShuNing <nolouch@gmail.com>
Co-authored-by: nolouch <nolouch@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@JmPotato JmPotato JmPotato approved these changes

@glorv glorv glorv approved these changes

@CabinfeverB CabinfeverB CabinfeverB approved these changes

@Yisaer Yisaer Awaiting requested review from Yisaer

Assignees
No one assigned
Labels
needs-cherry-pick-release-7.5 Should cherry pick this PR to release-7.5 branch. 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. 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.

Meta issue DATA RACE at the resource_group/controller.(*groupCostController)
5 participants
@nolouch @ti-chi-bot @JmPotato @glorv @CabinfeverB