refactor: adjust logs

Author: drmingdrmer

async-raft/src/core/client.rs

@@ -73,6 +73,7 @@ impl<'a, D: AppData, R: AppDataResponse, N: RaftNetwork<D>, S: RaftStorage<D, R>
             entry: Arc::new(entry),
             tx: None,
         };
+        // TODO(xp): it should update the lost_log_id
         self.replicate_client_request(cr_entry).await;
 
         Ok(())

async-raft/src/core/mod.rs

@@ -714,7 +714,6 @@ impl<'a, D: AppData, R: AppDataResponse, N: RaftNetwork<D>, S: RaftStorage<D, R>
         self.core.update_current_leader(UpdateCurrentLeader::ThisNode);
         self.leader_report_metrics();
 
-        // Per §8, commit an initial entry as part of becoming the cluster leader.
         self.commit_initial_leader_entry().await?;
 
         loop {

async-raft/src/replication/mod.rs

@@ -139,6 +139,7 @@ struct ReplicationCore<D: AppData, R: AppDataResponse, N: RaftNetwork<D>, S: Raf
 
 impl<D: AppData, R: AppDataResponse, N: RaftNetwork<D>, S: RaftStorage<D, R>> ReplicationCore<D, R, N, S> {
     /// Spawn a new replication task for the target node.
+    #[tracing::instrument(level = "debug", skip(config, network, storage, raft_core_tx))]
     pub(self) fn spawn(
         id: NodeId,
         target: NodeId,
@@ -383,6 +384,7 @@ impl<D: AppData, R: AppDataResponse, N: RaftNetwork<D>, S: RaftStorage<D, R>> Re
     }
 
     /// max_possible_matched_index is the least index for `prev_log_id` to form a consecutive log sequence
+    #[tracing::instrument(level = "debug", skip(self), fields(max_possible_matched_index=self.max_possible_matched_index))]
     fn check_consecutive(&self, first_log_index: u64) -> Result<(), ReplicationError> {
         if first_log_index > self.max_possible_matched_index {
             return Err(ReplicationError::LackEntry(LackEntry {

async-raft/tests/append_conflicts.rs

@@ -209,8 +209,13 @@ where
     Sto: RaftStorage<D, R>,
 {
     let logs = sto.get_log_entries(..).await?;
-    let want: Vec<Entry<ClientRequest>> =
-        terms.iter().enumerate().map(|(i, term)| ent(*term, (i) as u64)).collect::<Vec<_>>();
+    let skip = 0;
+    let want: Vec<Entry<ClientRequest>> = terms
+        .iter()
+        .skip(skip)
+        .enumerate()
+        .map(|(i, term)| ent(*term, (i + skip) as u64))
+        .collect::<Vec<_>>();
 
     assert_eq!(want.as_slice().summary(), logs.as_slice().summary());
 

async-raft/tests/members.rs

@@ -115,9 +115,9 @@ async fn members_add_absent_non_voter_blocking() -> Result<()> {
         for node_id in 0..2 {
             let sto = router.get_storage_handle(&node_id).await?;
             let logs = sto.get_log_entries(..).await?;
-            assert_eq!(n_logs, logs[logs.len() - 1].log_id.index);
+            assert_eq!(n_logs, logs[logs.len() - 1].log_id.index, "node: {}", node_id);
             // 0-th log
-            assert_eq!(n_logs + 1, logs.len() as u64);
+            assert_eq!(n_logs + 1, logs.len() as u64, "node: {}", node_id);
         }
     }