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: only persist merge target if the merge is known to be succeeded #12251

Merged

ti-chi-bot merged 6 commits into tikv:master from NingLin-P:fix-fake-merge-target

Mar 25, 2022

Member

NingLin-P commented Mar 23, 2022

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

NingLin-P added 2 commits

March 23, 2022 20:38


          only persist merge state when the merge is known to be succeeded

f9a8da7

Signed-off-by: linning <linningde25@gmail.com>


          add test

43792c0

Signed-off-by: linning <linningde25@gmail.com>

Member

ti-chi-bot commented Mar 23, 2022 •

edited

[REVIEW NOTIFICATION]

This pull request has been approved by:

5kbpers
you06

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 added release-note size/L labels

NingLin-P requested review from 5kbpers, BusyJay and glorv

March 23, 2022 12:43


          update comment

791566e

Signed-off-by: linning <linningde25@gmail.com>

BusyJay reviewed

View reviewed changes

tests/failpoints/cases/test_merge.rs Outdated Show resolved Hide resolved

tests/failpoints/cases/test_merge.rs Outdated Show resolved Hide resolved

BusyJay approved these changes

View reviewed changes

components/raftstore/src/store/peer.rs Outdated Show resolved Hide resolved


          address comment

e049c24

Signed-off-by: linning <linningde25@gmail.com>

NingLin-P force-pushed the fix-fake-merge-target branch from a402b7b to e049c24 Compare

March 24, 2022 06:37

5kbpers approved these changes

View reviewed changes

ti-chi-bot added the status/LGT1 label

you06 approved these changes

View reviewed changes

ti-chi-bot added status/LGT2 and removed status/LGT1 labels

Member

5kbpers commented Mar 25, 2022

/merge

Member

ti-chi-bot commented Mar 25, 2022

@5kbpers: 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.

Member

ti-chi-bot commented Mar 25, 2022

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

Commit hash: e049c24

ti-chi-bot added the status/can-merge label

ti-chi-bot added 2 commits

March 25, 2022 16:31


          Merge branch 'master' into fix-fake-merge-target

04f733e


          Merge branch 'master' into fix-fake-merge-target

fca6010

Contributor

you06 commented Mar 25, 2022

/test

1 similar comment

Contributor

you06 commented Mar 25, 2022

/test

ti-chi-bot merged commit 3364702 into tikv:master

you06 added the needs-cherry-pick-release-6.0 label

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request


          cherry pick tikv#12251 to release-6.0

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request

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

Merged

NingLin-P added the needs-cherry-pick-release-5.4 label

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request


          cherry pick tikv#12251 to release-3.1

41b4579

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request

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

Closed

Contributor

ti-srebot commented Mar 28, 2022

cherry pick to release-3.1 in PR #12290

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request


          cherry pick tikv#12251 to release-5.0

e5ffd2b

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request

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

Closed

Contributor

ti-srebot commented Mar 28, 2022

cherry pick to release-5.0 in PR #12291

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request


          cherry pick tikv#12251 to release-3.0

5345a2b

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request

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

Closed

Contributor

ti-srebot commented Mar 28, 2022

cherry pick to release-3.0 in PR #12292

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request


          cherry pick tikv#12251 to release-5.1

4789cb9

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request

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

Closed

Contributor

ti-srebot commented Mar 28, 2022

cherry pick to release-5.1 in PR #12293

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request


          cherry pick tikv#12251 to release-4.0

22f969a

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request

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

Closed

Contributor

ti-srebot commented Mar 28, 2022

cherry pick to release-4.0 in PR #12294

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request


          cherry pick tikv#12251 to release-5.4

915a8ff

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request

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

Merged

Contributor

ti-srebot commented Mar 28, 2022

cherry pick to release-5.4 in PR #12295

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request


          cherry pick tikv#12251 to release-5.3

d549f91

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request

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

Merged

Contributor

ti-srebot commented Mar 28, 2022

cherry pick to release-5.3 in PR #12296

ti-srebot pushed a commit to ti-srebot/tikv that referenced this pull request


          cherry pick tikv#12251 to release-5.2

72767cc

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>

ti-srebot mentioned this pull request

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

Merged

Contributor

ti-srebot commented Mar 28, 2022

cherry pick to release-5.2 in PR #12297

NingLin-P added a commit to ti-srebot/tikv that referenced this pull request


          cherry pick tikv#12251 to release-3.1

d4fc44b

Signed-off-by: linning <linningde25@gmail.com>

NingLin-P added a commit to ti-srebot/tikv that referenced this pull request


          cherry pick tikv#12251 to release-3.0

5e00028

Signed-off-by: linning <linningde25@gmail.com>

ti-chi-bot added a commit that referenced this pull request


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

bf637ac

…eeded (#12251) (#12297)

close #12232, ref #12251

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

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Signed-off-by: linning <linningde25@gmail.com>

Co-authored-by: NingLin-P <linningde25@gmail.com>
Co-authored-by: linning <linningde25@gmail.com>
Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>

ti-chi-bot added a commit that referenced this pull request


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

60a9315

…eeded (#12251) (#12295)

close #12232, ref #12251

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

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Signed-off-by: linning <linningde25@gmail.com>

Co-authored-by: NingLin-P <linningde25@gmail.com>
Co-authored-by: linning <linningde25@gmail.com>
Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>

ti-chi-bot added a commit that referenced this pull request


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

e8b6812

…eeded (#12251) (#12296)

close #12232, ref #12251

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

Signed-off-by: ti-srebot <ti-srebot@pingcap.com>
Signed-off-by: linning <linningde25@gmail.com>

Co-authored-by: NingLin-P <linningde25@gmail.com>
Co-authored-by: linning <linningde25@gmail.com>
Co-authored-by: glorv <glorvs@163.com>
Co-authored-by: Ti Chi Robot <ti-community-prow-bot@tidb.io>

Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

needs-cherry-pick-release-3.0 needs-cherry-pick-release-3.1 needs-cherry-pick-release-4.0 needs-cherry-pick-release-5.0 needs-cherry-pick-release-5.1 needs-cherry-pick-release-5.2 needs-cherry-pick-release-5.3 needs-cherry-pick-release-5.4 needs-cherry-pick-release-6.0 release-note size/L status/can-merge status/LGT2