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

raftstore: only persist merge target if the merge is known to be succeeded (#12251) #12293

Closed

Conversation

ti-srebot
Copy link
Contributor

@ti-srebot ti-srebot commented Mar 28, 2022

cherry-pick #12251 to release-5.1
You can switch your code base to this Pull Request by using git-extras:

# In tikv repo:
git pr https://github.com/tikv/tikv/pull/12293

After apply modifications, you can push your change to this PR via:

git push git@github.com:ti-srebot/tikv.git pr/12293:release-5.1-3364702e1903

What is changed and how it works?

Issue Number: Close #12232

What's Changed:

When destroying, only persist merge target if the merge is known to be succeeded

raftstore: only persist merge target if the merge is known to be succeeded

Check List

Tests

  • Integration test

Release note

fix tikv panic and peer unexpected destroy due to fake merge target

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
@ti-chi-bot
Copy link
Member

ti-chi-bot commented Mar 28, 2022

[REVIEW NOTIFICATION]

This pull request has been approved by:

  • BusyJay
  • ekexium

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-srebot
Copy link
Contributor Author

/run-all-tests

@ti-srebot
Copy link
Contributor Author

@NingLin-P you're already a collaborator in bot's repo.

Signed-off-by: linning <linningde25@gmail.com>
@ti-chi-bot ti-chi-bot added size/L and removed size/XL labels Mar 29, 2022
@ti-chi-bot ti-chi-bot added the status/LGT1 Status: PR - There is already 1 approval label Dec 9, 2022
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Dec 9, 2022
@ti-chi-bot ti-chi-bot added status/LGT2 Status: PR - There are already 2 approvals and removed status/LGT1 Status: PR - There is already 1 approval labels Dec 9, 2022
Signed-off-by: ekexium <eke@fastmail.com>
@VelocityLight VelocityLight added do-not-merge/cherry-pick-not-approved and removed cherry-pick-approved Cherry pick PR approved by release team. labels Dec 14, 2022
@VelocityLight VelocityLight added cherry-pick-approved Cherry pick PR approved by release team. and removed do-not-merge/cherry-pick-not-approved labels Dec 14, 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. release-note size/L status/LGT2 Status: PR - There are already 2 approvals type/cherry-pick Type: PR - Cherry pick
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

6 participants