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

raftstore: fix the recovery process hanging issue caused orphaned unsafe recovery state #12657

Merged
merged 3 commits into from
May 27, 2022
Merged

raftstore: fix the recovery process hanging issue caused orphaned unsafe recovery state #12657

merged 3 commits into from
May 27, 2022

Conversation

v01dstar
Copy link
Contributor

@v01dstar v01dstar commented May 26, 2022 •
edited
Loading

Signed-off-by: v01dstar [email protected]

What is changed and how it works?

Issue Number: Close #12644

What's Changed:

Cleaning up the unsafe recovery state after exiting previous joint state before proposing the recovery demotion which may return early if any error happens and leave the state untouched.

Related changes

Check List

Tests

  • Integration test

Side effects

  • Performance regression
    N/A
  • Breaking backward compatibility
    N/A

Release note 

None

@ti-chi-bot
Copy link
Member

ti-chi-bot commented May 26, 2022 •
edited
Loading

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • 5kbpers
  • Connor1996

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-linked-issue release-note Denotes a PR that will be considered when it comes time to generate release notes. labels May 26, 2022
@v01dstar v01dstar changed the title raftstoreFix orphaned unsafe recovery state that causes the recovery process to hang forever raftstore: fix orphaned unsafe recovery state that causes the recovery process to hang forever May 26, 2022
@ti-chi-bot ti-chi-bot added size/L Denotes a PR that changes 100-499 lines, ignoring generated files. release-note-none Denotes a PR that doesn't merit a release note. needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. and removed do-not-merge/needs-linked-issue release-note Denotes a PR that will be considered when it comes time to generate release notes. labels May 26, 2022
@v01dstar v01dstar changed the title raftstore: fix orphaned unsafe recovery state that causes the recovery process to hang forever raftstore: fix the recovery process hanging issue caused orphaned unsafe recovery state May 26, 2022
@v01dstar
Copy link
Contributor Author

/cc @Connor1996

@ti-chi-bot ti-chi-bot requested a review from Connor1996 May 26, 2022 05:03
@Connor1996 Connor1996 requested a review from 5kbpers May 26, 2022 06:33
@v01dstar
Add additional log info
e6f6592 
Signed-off-by: v01dstar <[email protected]>
Connor1996
Connor1996 approved these changes May 27, 2022
View reviewed changes
Copy link
Member

@Connor1996 Connor1996 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 added the status/LGT1 Indicates that a PR has LGTM 1. label May 27, 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 May 27, 2022
@Connor1996
Copy link
Member

/merge

@ti-chi-bot
Copy link
Member

@Connor1996: 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
Copy link
Member

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

Commit hash: e6f6592

@ti-chi-bot ti-chi-bot added the status/can-merge Indicates a PR has been approved by a committer. label May 27, 2022
@ti-chi-bot ti-chi-bot merged commit ae2f059 into tikv:master May 27, 2022
ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request May 27, 2022
@v01dstar @ti-srebot
cherry pick tikv#12657 to release-6.1
e6db78d 
Signed-off-by: ti-srebot <[email protected]>
@ti-srebot ti-srebot mentioned this pull request May 27, 2022
Merged
@ti-srebot
Copy link
Contributor

cherry pick to release-6.1 in PR #12675

@v01dstar v01dstar deleted the fix-exit-joint branch May 27, 2022 06:32
ti-chi-bot pushed a commit that referenced this pull request May 27, 2022
@ti-srebot @v01dstar
raftstore: fix the recovery process hanging issue caused orphaned uns…
f20a51d 
…afe recovery state (#12657) (#12675)

ref #12022, close #12644, ref #12657

Cleaning up the unsafe recovery state after exiting previous joint state before proposing the recovery demotion which may return early if any error happens and leave the state untouched.

Signed-off-by: ti-srebot <[email protected]>

Co-authored-by: Yang Zhang <[email protected]>
joccau pushed a commit to joccau/tikv that referenced this pull request Jun 23, 2022
@ti-srebot @v01dstar @joccau
raftstore: fix the recovery process hanging issue caused orphaned uns…
9db34a1 
…afe recovery state (tikv#12657) (tikv#12675)

ref tikv#12022, close tikv#12644, ref tikv#12657

Cleaning up the unsafe recovery state after exiting previous joint state before proposing the recovery demotion which may return early if any error happens and leave the state untouched.

Signed-off-by: ti-srebot <[email protected]>

Co-authored-by: Yang Zhang <[email protected]>
Signed-off-by: joccau <[email protected]>
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Reviewers

@5kbpers 5kbpers 5kbpers approved these changes

@Connor1996 Connor1996 Connor1996 approved these changes

Assignees
No one assigned
Labels
needs-cherry-pick-release-6.1 Should cherry pick this PR to release-6.1 branch. release-note-none Denotes a PR that doesn't merit a release note. size/L Denotes a PR that changes 100-499 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
5 participants
@v01dstar @ti-chi-bot @Connor1996 @ti-srebot @5kbpers