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

cluster: add the RLock back #5022

Merged
merged 1 commit into from May 24, 2022
Merged

cluster: add the RLock back #5022

merged 1 commit into from May 24, 2022

Conversation

rleungx
Copy link
Member

@rleungx rleungx commented May 24, 2022

Signed-off-by: Ryan Leung rleungx@gmail.com

What problem does this PR solve?

Issue Number: Close #5006.

What is changed and how does it work?

This PR adds the RLock back because we need to ensure the correctness of concurrency.

Related changes

  • Need to cherry-pick to the release branch

Release note

None

Signed-off-by: Ryan Leung <rleungx@gmail.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 24, 2022

[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 added do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. release-note-none do-not-merge/needs-triage-completed labels May 24, 2022
@rleungx rleungx marked this pull request as ready for review May 24, 2022 10:19
@ti-chi-bot ti-chi-bot removed the do-not-merge/work-in-progress Indicates that a PR should not merge because it is a work in progress. label May 24, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label May 24, 2022
@codecov
Copy link

codecov bot commented May 24, 2022

Codecov Report

Merging #5022 (61b8b1f) into master (efb4c9f) will decrease coverage by 0.25%.
The diff coverage is 100.00%.

@@            Coverage Diff             @@
##           master    #5022      +/-   ##
==========================================
- Coverage   75.61%   75.35%   -0.26%     
==========================================
  Files         307      307              
  Lines       30231    30233       +2     
==========================================
- Hits        22858    22782      -76     
- Misses       5390     5443      +53     
- Partials     1983     2008      +25     
Flag Coverage Δ
unittests 75.35% <100.00%> (-0.26%) ⬇️

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

Impacted Files Coverage Δ
server/cluster/cluster.go 82.53% <100.00%> (+0.03%) ⬆️
...erver/config/service_middleware_persist_options.go 88.88% <0.00%> (-11.12%) ⬇️
server/schedulers/shuffle_hot_region.go 55.55% <0.00%> (-10.11%) ⬇️
server/tso/local_allocator.go 71.62% <0.00%> (-6.76%) ⬇️
server/region_syncer/server.go 83.15% <0.00%> (-4.35%) ⬇️
server/tso/allocator_manager.go 61.73% <0.00%> (-3.67%) ⬇️
pkg/etcdutil/etcdutil.go 85.05% <0.00%> (-3.45%) ⬇️
server/tso/tso.go 67.79% <0.00%> (-2.83%) ⬇️
server/schedule/labeler/rules.go 87.50% <0.00%> (-2.28%) ⬇️
server/election/leadership.go 78.35% <0.00%> (-2.07%) ⬇️
... and 17 more

Continue to review full report at Codecov.

Legend - Click here to learn more
Δ = absolute <relative> (impact), ø = not affected, ? = missing data
Powered by Codecov. Last update efb4c9f...61b8b1f. Read the comment docs.

@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 May 24, 2022
@rleungx
Copy link
Member Author

rleungx commented May 24, 2022

/merge

@ti-chi-bot
Copy link
Member

@rleungx: 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 ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 24, 2022
@rleungx
Copy link
Member Author

rleungx commented May 24, 2022

/merge cancel

@ti-chi-bot ti-chi-bot removed the status/can-merge Indicates a PR has been approved by a committer. label May 24, 2022
@rleungx rleungx requested review from AndreMouche and removed request for Yisaer May 24, 2022 10:43
Copy link
Member

@AndreMouche AndreMouche left a comment

Choose a reason for hiding this comment

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

LGTM

@rleungx
Copy link
Member Author

rleungx commented May 24, 2022

/merge

@ti-chi-bot
Copy link
Member

@rleungx: 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

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

Commit hash: 61b8b1f

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 24, 2022
@ti-chi-bot ti-chi-bot merged commit b3eeaae into tikv:master May 24, 2022
@ti-chi-bot
Copy link
Member

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

@rleungx rleungx deleted the fix-lock1 branch May 25, 2022 02:26
ti-chi-bot added a commit that referenced this pull request May 25, 2022
close #5006, ref #5022

Signed-off-by: Ryan Leung <rleungx@gmail.com>

Co-authored-by: Ryan Leung <rleungx@gmail.com>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
needs-cherry-pick-release-6.1 release-note-none 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.

server/cluster/cluster.go: Lock needed when update the store-version
5 participants