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: change the condition of proposing rollback merge #7679

Merged
merged 4 commits into from
Apr 29, 2020

Conversation

gengliqi
Copy link
Member

@gengliqi gengliqi commented Apr 28, 2020

Signed-off-by: Liqi Geng gengliqiii@gmail.com

cherry-pick #6584 to release 3.0

Release note

Fix a bug that may cause data loss during merging and network partition.

Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
@gengliqi gengliqi requested review from BusyJay and Connor1996 April 28, 2020 07:53
@gengliqi gengliqi added sig/raft Component: Raft, RaftStore, etc. type/bugfix This PR fixes a bug. labels Apr 28, 2020
@gengliqi gengliqi added this to the v3.0.14 milestone Apr 28, 2020
// Test if the rollback merge proposal is proposed before the majority of peers want to rollback
#[test]
fn test_node_mutiple_rollback_merge() {
let mut cluster = new_node_cluster(0, 3);
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I think you still need to use crate::setup().

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Done

Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
@youjiali1995
Copy link
Contributor

/merge

@sre-bot sre-bot added the status/can-merge Indicates a PR has been approved by a committer. label Apr 29, 2020
@sre-bot
Copy link
Contributor

sre-bot commented Apr 29, 2020

Your auto merge job has been accepted, waiting for:

  • 7559

@sre-bot
Copy link
Contributor

sre-bot commented Apr 29, 2020

/run-all-tests

@sre-bot sre-bot merged commit 20ff341 into tikv:release-3.0 Apr 29, 2020
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
sig/raft Component: Raft, RaftStore, etc. status/can-merge Indicates a PR has been approved by a committer. type/bugfix This PR fixes a bug.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

5 participants