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: set is_merging flag after restart #5871

Merged
merged 5 commits into from Nov 26, 2019

Conversation

@gengliqi
Copy link
Member

gengliqi commented Nov 12, 2019

cherry-pick #5868 to release-3.1

What have you changed?

Fix a region merge bug, set is_merging flag after restart.
When a crash/restart after prepareMerge being applied before compact log being applied, is_merging is not set so the compact log can not be ignored.
Then panic happens on getting entries for proposing commitMerge.
Add a failpoint test case, previous code panic almost every time I run this test.

What is the type of the changes?

  • Bugfix (a change which fixes an issue)

How is the PR tested?

  • Integration test

Does this PR affect documentation (docs) or should it be mentioned in the release notes?

No

Does this PR affect tidb-ansible?

No

Signed-off-by: gengliqi <gengliqiii@gmail.com>
@gengliqi gengliqi requested review from Connor1996 and BusyJay Nov 12, 2019
Copy link
Member

Connor1996 left a comment

LGTM

@BusyJay BusyJay added the S: CanMerge label Nov 13, 2019
@sre-bot

This comment has been minimized.

Copy link
Collaborator

sre-bot commented Nov 13, 2019

Sorry @BusyJay, you don't have permission to trigger auto merge event on this branch.

@AndreMouche

This comment has been minimized.

Copy link
Member

AndreMouche commented Nov 14, 2019

/merge

@BusyJay BusyJay added this to the v3.1.0-beta milestone Nov 21, 2019
@gengliqi

This comment has been minimized.

Copy link
Member Author

gengliqi commented Nov 24, 2019

/run-all-tests

@AndreMouche

This comment has been minimized.

Copy link
Member

AndreMouche commented Nov 26, 2019

/merge

@sre-bot

This comment has been minimized.

Copy link
Collaborator

sre-bot commented Nov 26, 2019

/run-all-tests

@sre-bot sre-bot merged commit 43dd558 into tikv:release-3.1 Nov 26, 2019
5 checks passed
5 checks passed
DCO All commits are signed off!
Details
idc-jenkins-ci-tikv/integration-common-test Jenkins job succeeded.
Details
idc-jenkins-ci-tikv/integration-compatibility-test Jenkins job succeeded.
Details
idc-jenkins-ci-tikv/integration-ddl-test Jenkins job succeeded.
Details
idc-jenkins-ci/test Jenkins job succeeded.
Details
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Projects
None yet
5 participants
You can’t perform that action at this time.