raftstore/config: support merge #2819
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
hicqu
reviewed
Mar 13, 2018
tests/raftstore_cases/test_snap.rs
Outdated
| @@ -435,6 +437,7 @@ fn test_snapshot_with_append<T: Simulator>(cluster: &mut Cluster<T>) { | |||
| // truncate the log quickly so that we can force sending snapshot. | |||
There was a problem hiding this comment.
How about add a method with_test_raftstore_config for Cluster?
hicqu
reviewed
Mar 13, 2018
src/raftstore/store/config.rs
Outdated
| @@ -149,6 +154,8 @@ impl Default for Config { | |||
| raft_store_max_leader_lease: ReadableDuration::secs(9), | |||
| right_derive_when_split: true, | |||
| allow_remove_leader: false, | |||
| max_merge_log_gap: 10, | |||
|
rest LGTM. |
|
/run-integration-tests |
|
PTAL |
overvenus
reviewed
Mar 14, 2018
src/raftstore/store/config.rs
Outdated
| @@ -95,6 +95,11 @@ pub struct Config { | |||
|
|
|||
| pub allow_remove_leader: bool, | |||
|
|
|||
| /// Max log gap allowed to propose merge. | |||
| pub merge_max_log_gap: u64, | |||
| // Interval to repropose merge. | |||
|
PTAL |
|
/run-integration-tests |
|
CI failed @BusyJay |
|
/run-integration-common-test |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
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.
This pr adds configuration entries for merge. Actual implementation see #2502.