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

fix data race by replace clone (#6242) #6350

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #6242

What problem does this PR solve?

Issue Number: Close #6230

What is changed and how does it work?

using ResetLimit to set limit rate. The ResetLimit will use lock

Check List

Tests

  • Unit test
func TestDataRace(t *testing.T) {
	store := NewStoreInfo(&metapb.Store{Id: uint64(1)}, ResetStoreLimit(storelimit.AddPeer, 10))
	wg := sync.WaitGroup{}
	wg.Add(1)
	go func() {
		store.GetStoreLimit().Reset(20, storelimit.AddPeer)
		wg.Done()
	}()
	store.IsAvailable(storelimit.AddPeer)
	wg.Wait()
}

Code changes

Side effects

Related changes

  • Need to cherry-pick to the release branch

Release note

None.

@ti-chi-bot
Copy link
Member Author

ti-chi-bot commented Apr 20, 2023

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CabinfeverB
  • bufferflies

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 do-not-merge/cherry-pick-not-approved release-note-none Denotes a PR that doesn't merit a release note. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR. labels Apr 20, 2023
@codecov
Copy link

codecov bot commented Apr 20, 2023

Codecov Report

❗ No coverage uploaded for pull request base (release-7.1@715a78d). Click here to learn what that means.
Patch has no changes to coverable lines.

❗ Current head a1ab3fb differs from pull request most recent head c61a01e. Consider uploading reports for the commit c61a01e to get more accurate results

Additional details and impacted files
@@              Coverage Diff               @@
##             release-7.1    #6350   +/-   ##
==============================================
  Coverage               ?   75.09%           
==============================================
  Files                  ?      408           
  Lines                  ?    40417           
  Branches               ?        0           
==============================================
  Hits                   ?    30353           
  Misses                 ?     7415           
  Partials               ?     2649           
Flag Coverage Δ
unittests 75.09% <0.00%> (?)

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

Help us with your feedback. Take ten seconds to tell us how you rate us. Have a feature suggestion? Share it here.

☔ View full report in Codecov by Sentry.
📢 Do you have feedback about the report comment? Let us know in this issue.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Apr 21, 2023
@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 Apr 21, 2023
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Apr 21, 2023
@bufferflies
Copy link
Contributor

/merge

@ti-chi-bot
Copy link
Member Author

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

/run-all-tests

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
Copy link
Member Author

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

Commit hash: 2abe074

@ti-chi-bot ti-chi-bot added status/can-merge Indicates a PR has been approved by a committer. and removed status/can-merge Indicates a PR has been approved by a committer. labels Apr 21, 2023
@bufferflies bufferflies force-pushed the cherry-pick-6242-to-release-7.1 branch from 477da32 to 57bea4e Compare April 21, 2023 04:15
close tikv#6230

Signed-off-by: bufferflies <1045931706@qq.com>

Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>
@bufferflies bufferflies force-pushed the cherry-pick-6242-to-release-7.1 branch from 57bea4e to a1ab3fb Compare April 21, 2023 04:21
@CabinfeverB
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member Author

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

/run-all-tests

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
Copy link
Member Author

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

Commit hash: a1ab3fb

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

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

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.

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 2695008 into tikv:release-7.1 Apr 21, 2023
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved cherry-pick-approved Cherry pick PR approved by release team. and removed cherry-pick-approved Cherry pick PR approved by release team. do-not-merge/cherry-pick-not-approved labels May 31, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
cherry-pick-approved Cherry pick PR approved by release team. release-note-none Denotes a PR that doesn't merit a release note. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. type/cherry-pick-for-release-7.1 This PR is cherry-picked to release-7.1 from a source PR.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

4 participants