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: fix the unreleased RLock issue (#4355) #4358

Merged

Conversation

ti-chi-bot
Copy link
Member

This is an automated cherry-pick of #4355

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

What problem does this PR solve?

Closes #4354.

What is changed and how it works?

Release the RLock if it returns early.

Check List

Tests

  • Unit test

Related changes

  • Need to cherry-pick to the release branch

Release note

Fix the issue that the RLock is not released

close tikv#4354

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

ti-chi-bot commented Nov 22, 2021

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • disksing
  • nolouch

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 Denotes a PR that will be considered when it comes time to generate release notes. component/cluster Cluster logic. type/cherry-pick-for-release-5.3 The PR belongs to release-5.3 cherry pick. labels Nov 22, 2021
@nolouch
Copy link
Contributor

nolouch commented Nov 22, 2021

/run-unit-tests

@codecov
Copy link

codecov bot commented Nov 22, 2021

Codecov Report

Merging #4358 (9366849) into release-5.3 (c49fbde) will increase coverage by 0.00%.
The diff coverage is 0.00%.

Impacted file tree graph

@@             Coverage Diff              @@
##           release-5.3    #4358   +/-   ##
============================================
  Coverage        74.97%   74.98%           
============================================
  Files              264      264           
  Lines            27266    27267    +1     
============================================
+ Hits             20442    20445    +3     
- Misses            5013     5023   +10     
+ Partials          1811     1799   -12     
Flag Coverage Δ
unittests 74.98% <0.00%> (+<0.01%) ⬆️

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

Impacted Files Coverage Δ
server/cluster/cluster.go 83.25% <0.00%> (+0.13%) ⬆️
server/tso/local_allocator.go 64.86% <0.00%> (-13.52%) ⬇️
pkg/dashboard/adapter/manager.go 78.72% <0.00%> (-4.26%) ⬇️
pkg/etcdutil/etcdutil.go 84.70% <0.00%> (-3.53%) ⬇️
server/tso/allocator_manager.go 64.83% <0.00%> (-1.84%) ⬇️
server/schedule/operator_controller.go 83.50% <0.00%> (-1.23%) ⬇️
pkg/btree/btree.go 85.78% <0.00%> (-0.97%) ⬇️
server/core/storage.go 69.54% <0.00%> (ø)
client/client.go 72.02% <0.00%> (+0.23%) ⬆️
... and 6 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 c49fbde...9366849. Read the comment docs.

@ti-chi-bot ti-chi-bot added the status/LGT1 Indicates that a PR has LGTM 1. label Nov 24, 2021
@zhouqiang-cl zhouqiang-cl added the cherry-pick-approved Cherry pick PR approved by release team. label Nov 30, 2021
@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 Nov 30, 2021
@nolouch
Copy link
Contributor

nolouch commented Nov 30, 2021

/merge

@ti-chi-bot
Copy link
Member Author

@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 Author

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

Commit hash: a433f8d

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label Nov 30, 2021
@nolouch
Copy link
Contributor

nolouch commented Nov 30, 2021

/run-unit-tests

@ti-chi-bot ti-chi-bot merged commit 1bb960a into tikv:release-5.3 Nov 30, 2021
@purelind purelind added this to the v5.3.1 milestone Feb 24, 2022
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. component/cluster Cluster logic. release-note Denotes a PR that will be considered when it comes time to generate release notes. status/can-merge Indicates a PR has been approved by a committer. status/LGT2 Indicates that a PR has LGTM 2. triage/accept type/cherry-pick-for-release-5.3 The PR belongs to release-5.3 cherry pick.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

6 participants