-
Notifications
You must be signed in to change notification settings - Fork 2.2k
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
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Signed-off-by: Liqi Geng <gengliqiii@gmail.com>
gengliqi
added
sig/raft
Component: Raft, RaftStore, etc.
type/bugfix
This PR fixes a bug.
labels
Apr 28, 2020
BusyJay
reviewed
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); |
There was a problem hiding this comment.
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()
.
There was a problem hiding this comment.
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>
BusyJay
approved these changes
Apr 28, 2020
Connor1996
approved these changes
Apr 28, 2020
/merge |
sre-bot
added
the
status/can-merge
Indicates a PR has been approved by a committer.
label
Apr 29, 2020
Your auto merge job has been accepted, waiting for:
|
/run-all-tests |
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.
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
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.