fix: when handle_update_match_index(), non-voter should also be considered, because when member change a non-voter is also count as a quorum member

drmingdrmer · drmingdrmer · commit a10d99066b8c · 2021-06-16T23:05:55.000+08:00
diff --git a/async-raft/src/core/replication.rs b/async-raft/src/core/replication.rs
@@ -138,33 +138,39 @@ impl<'a, D: AppData, R: AppDataResponse, N: RaftNetwork<D>, S: RaftStorage<D, R>
     }
 
     /// Handle events from a replication stream which updates the target node's match index.
-    #[tracing::instrument(level = "trace", skip(self, target, match_index))]
+    #[tracing::instrument(level = "trace", skip(self))]
     async fn handle_update_match_index(
         &mut self,
         target: NodeId,
         match_index: u64,
         match_term: u64,
     ) -> RaftResult<()> {
-        // If this is a non-voter, then update and return.
+        let mut found = false;
+
         if let Some(state) = self.non_voters.get_mut(&target) {
             state.state.match_index = match_index;
             state.state.match_term = match_term;
-            return Ok(());
+            found = true;
         }
 
         // Update target's match index & check if it is awaiting removal.
         let mut needs_removal = false;
-        match self.nodes.get_mut(&target) {
-            Some(state) => {
-                state.match_index = match_index;
-                state.match_term = match_term;
-                if let Some(threshold) = &state.remove_after_commit {
-                    if &match_index >= threshold {
-                        needs_removal = true;
-                    }
+
+        if let Some(state) = self.nodes.get_mut(&target) {
+            state.match_index = match_index;
+            state.match_term = match_term;
+            found = true;
+
+            if let Some(threshold) = &state.remove_after_commit {
+                if &match_index >= threshold {
+                    needs_removal = true;
                 }
             }
-            _ => return Ok(()), // Node not found.
+        }
+
+        if !found {
+            // no such node
+            return Ok(());
         }
 
         // Drop replication stream if needed.
diff --git a/async-raft/src/replication/mod.rs b/async-raft/src/replication/mod.rs
@@ -281,9 +281,12 @@ impl<D: AppData, R: AppDataResponse, N: RaftNetwork<D>, S: RaftStorage<D, R>>
             .map(|last| (last.as_ref().index, last.as_ref().term));
         self.outbound_buffer.clear(); // Once we've successfully sent a payload of entries, don't send them again.
 
+        tracing::debug!("append_entries last: {:?}", last_index_and_term);
+
         // Handle success conditions.
         if res.success {
-            tracing::trace!("append entries succeeded");
+            tracing::debug!("append entries succeeded to {:?}", last_index_and_term);
+
             // If this was a proper replication event (last index & term were provided), then update state.
             if let Some((index, term)) = last_index_and_term {
                 self.next_index = index + 1; // This should always be the next expected index.
