proto: introduce joint-consensus from etcd/raft (#310)

Signed-off-by: qupeng <[email protected]>
tikv · Nov 5, 2019 · d34f693 · d34f693
1 parent faa4384
commit d34f693
Show file tree

Hide file tree

Showing 14 changed files with 113 additions and 2,439 deletions.
diff --git a/examples/five_mem_node/main.rs b/examples/five_mem_node/main.rs
@@ -300,11 +300,9 @@ fn on_ready(
                     ConfChangeType::AddNode => raft_group.raft.add_node(node_id).unwrap(),
                     ConfChangeType::RemoveNode => raft_group.raft.remove_node(node_id).unwrap(),
                     ConfChangeType::AddLearnerNode => raft_group.raft.add_learner(node_id).unwrap(),
-                    ConfChangeType::BeginMembershipChange
-                    | ConfChangeType::FinalizeMembershipChange => unimplemented!(),
                 }
                 let cs = raft_group.raft.prs().configuration().to_conf_state();
-                store.wl().set_conf_state(cs, None);
+                store.wl().set_conf_state(cs);
             } else {
                 // For normal proposals, extract the key-value pair and then
                 // insert them into the kv engine.

diff --git a/harness/tests/integration_cases/mod.rs b/harness/tests/integration_cases/mod.rs
@@ -11,7 +11,6 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 
-mod test_membership_changes;
 mod test_raft;
 mod test_raft_flow_control;
 mod test_raft_paper;