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 AtomicCheckAndPutRegion deadlock #5758

Merged
merged 3 commits into from
Dec 5, 2022

Conversation

rleungx
Copy link
Member

@rleungx rleungx commented Dec 5, 2022

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

What problem does this PR solve?

Issue Number: Close #5757, #5755.

What is changed and how does it work?

Check List

Tests

  • Unit test

Release note

None

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

ti-chi-bot commented Dec 5, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • CabinfeverB
  • lhy1024

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/needs-triage-completed release-note-none Denotes a PR that doesn't merit a release note. labels Dec 5, 2022
@rleungx rleungx changed the title *: fix region deadlock *: fix AtomicCheckAndPutRegion deadlock Dec 5, 2022
@rleungx rleungx requested review from HunDunDM and removed request for disksing December 5, 2022 09:05
@rleungx rleungx added the needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. label Dec 5, 2022
Signed-off-by: Ryan Leung <rleungx@gmail.com>
@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Dec 5, 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 Dec 5, 2022
@codecov
Copy link

codecov bot commented Dec 5, 2022

Codecov Report

Base: 75.50% // Head: 75.59% // Increases project coverage by +0.08% 🎉

Coverage data is based on head (b663a12) compared to base (5f05176).
Patch coverage: 100.00% of modified lines in pull request are covered.

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

Additional details and impacted files
@@            Coverage Diff             @@
##           master    #5758      +/-   ##
==========================================
+ Coverage   75.50%   75.59%   +0.08%     
==========================================
  Files         330      330              
  Lines       32955    32958       +3     
==========================================
+ Hits        24884    24913      +29     
+ Misses       5914     5897      -17     
+ Partials     2157     2148       -9     
Flag Coverage Δ
unittests 75.59% <100.00%> (+0.08%) ⬆️

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

Impacted Files Coverage Δ
server/cluster/cluster.go 81.63% <100.00%> (+0.37%) ⬆️
server/core/region.go 90.28% <100.00%> (+0.29%) ⬆️
server/tso/local_allocator.go 64.86% <0.00%> (-6.76%) ⬇️
server/storage/storage.go 67.30% <0.00%> (-3.85%) ⬇️
server/id/id.go 83.05% <0.00%> (-3.39%) ⬇️
server/storage/endpoint/meta.go 61.36% <0.00%> (-2.28%) ⬇️
server/schedule/hbstream/heartbeat_streams.go 72.72% <0.00%> (-2.03%) ⬇️
server/schedule/operator_controller.go 85.74% <0.00%> (-0.91%) ⬇️
server/schedulers/evict_leader.go 78.57% <0.00%> (-0.90%) ⬇️
server/statistics/hot_peer_cache.go 96.13% <0.00%> (-0.78%) ⬇️
... and 18 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 at Codecov.
📢 Do you have feedback about the report comment? Let us know in this issue.

@nolouch
Copy link
Contributor

nolouch commented Dec 5, 2022

/merge

@ti-chi-bot
Copy link
Member

@nolouch: 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: b663a12

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

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

@rleungx rleungx deleted the fix-deadlock1 branch December 5, 2022 10:17
@sre-bot sre-bot added the cherry-pick-approved Cherry pick PR approved by release team. label Dec 5, 2022
ti-chi-bot added a commit that referenced this pull request Dec 5, 2022
ref #5755, close #5757, ref #5758

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
cherry-pick-approved Cherry pick PR approved by release team. needs-cherry-pick-release-6.5 Should cherry pick this PR to release-6.5 branch. 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.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

Deadlock problem in AtomicCheckAndPutRegion
7 participants