From 11b473fe9eed0502a1ea47b2b748833cf63eb96b Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Wed, 20 Jul 2022 11:56:46 +0800
Subject: [PATCH] refactor(sync): add trace log

---
 source/libs/sync/src/syncRequestVoteReply.c | 24 ++++++++++-----------
 source/libs/sync/src/syncSnapshot.c         |  6 ++++++
 2 files changed, 18 insertions(+), 12 deletions(-)

diff --git a/source/libs/sync/src/syncRequestVoteReply.c b/source/libs/sync/src/syncRequestVoteReply.c
index 40d33959dd..299b5986df 100644
--- a/source/libs/sync/src/syncRequestVoteReply.c
+++ b/source/libs/sync/src/syncRequestVoteReply.c
@@ -46,8 +46,8 @@ int32_t syncNodeOnRequestVoteReplyCb(SSyncNode* ths, SyncRequestVoteReply* pMsg)
     uint16_t port;
     syncUtilU642Addr(pMsg->srcId.addr, host, sizeof(host), &port);
     char logBuf[256];
-    snprintf(logBuf, sizeof(logBuf), "recv request-vote-reply from %s:%d {term:%" PRIu64 ", grant:%d} ", pMsg->term,
-             pMsg->voteGranted);
+    snprintf(logBuf, sizeof(logBuf), "recv request-vote-reply from %s:%d {term:%" PRIu64 ", grant:%d} ", host, port,
+             pMsg->term, pMsg->voteGranted);
     syncNodeEventLog(ths, logBuf);
   } while (0);
 
@@ -58,8 +58,8 @@ int32_t syncNodeOnRequestVoteReplyCb(SSyncNode* ths, SyncRequestVoteReply* pMsg)
     syncUtilU642Addr(pMsg->srcId.addr, host, sizeof(host), &port);
     char logBuf[256];
     snprintf(logBuf, sizeof(logBuf),
-             "recv request-vote-reply from %s:%d {term:%" PRIu64 ", grant:%d}, maybe replica dropped", pMsg->term,
-             pMsg->voteGranted);
+             "recv request-vote-reply from %s:%d {term:%" PRIu64 ", grant:%d}, maybe replica dropped", host, port,
+             pMsg->term, pMsg->voteGranted);
     syncNodeErrorLog(ths, logBuf);
     return -1;
   }
@@ -71,8 +71,8 @@ int32_t syncNodeOnRequestVoteReplyCb(SSyncNode* ths, SyncRequestVoteReply* pMsg)
     syncUtilU642Addr(pMsg->srcId.addr, host, sizeof(host), &port);
     char logBuf[256];
     snprintf(logBuf, sizeof(logBuf),
-             "recv request-vote-reply from %s:%d {term:%" PRIu64 ", grant:%d}, drop stale response", pMsg->term,
-             pMsg->voteGranted);
+             "recv request-vote-reply from %s:%d {term:%" PRIu64 ", grant:%d}, drop stale response", host, port,
+             pMsg->term, pMsg->voteGranted);
     syncNodeErrorLog(ths, logBuf);
     return -1;
   }
@@ -89,7 +89,7 @@ int32_t syncNodeOnRequestVoteReplyCb(SSyncNode* ths, SyncRequestVoteReply* pMsg)
     syncUtilU642Addr(pMsg->srcId.addr, host, sizeof(host), &port);
     char logBuf[256];
     snprintf(logBuf, sizeof(logBuf), "recv request-vote-reply from %s:%d {term:%" PRIu64 ", grant:%d}, error term",
-             pMsg->term, pMsg->voteGranted);
+             host, port, pMsg->term, pMsg->voteGranted);
     syncNodeErrorLog(ths, logBuf);
     return -1;
   }
@@ -203,8 +203,8 @@ int32_t syncNodeOnRequestVoteReplySnapshotCb(SSyncNode* ths, SyncRequestVoteRepl
     syncUtilU642Addr(pMsg->srcId.addr, host, sizeof(host), &port);
     char logBuf[256];
     snprintf(logBuf, sizeof(logBuf),
-             "recv request-vote-reply from %s:%d {term:%" PRIu64 ", grant:%d}, maybe replica dropped", pMsg->term,
-             pMsg->voteGranted);
+             "recv request-vote-reply from %s:%d {term:%" PRIu64 ", grant:%d}, maybe replica dropped", host, port,
+             pMsg->term, pMsg->voteGranted);
     syncNodeErrorLog(ths, logBuf);
     return -1;
   }
@@ -216,8 +216,8 @@ int32_t syncNodeOnRequestVoteReplySnapshotCb(SSyncNode* ths, SyncRequestVoteRepl
     syncUtilU642Addr(pMsg->srcId.addr, host, sizeof(host), &port);
     char logBuf[256];
     snprintf(logBuf, sizeof(logBuf),
-             "recv request-vote-reply from %s:%d {term:%" PRIu64 ", grant:%d}, drop stale response", pMsg->term,
-             pMsg->voteGranted);
+             "recv request-vote-reply from %s:%d {term:%" PRIu64 ", grant:%d}, drop stale response", host, port,
+             pMsg->term, pMsg->voteGranted);
     syncNodeErrorLog(ths, logBuf);
     return -1;
   }
@@ -234,7 +234,7 @@ int32_t syncNodeOnRequestVoteReplySnapshotCb(SSyncNode* ths, SyncRequestVoteRepl
     syncUtilU642Addr(pMsg->srcId.addr, host, sizeof(host), &port);
     char logBuf[256];
     snprintf(logBuf, sizeof(logBuf), "recv request-vote-reply from %s:%d {term:%" PRIu64 ", grant:%d}, error term",
-             pMsg->term, pMsg->voteGranted);
+             host, port, pMsg->term, pMsg->voteGranted);
     syncNodeErrorLog(ths, logBuf);
     return -1;
   }
diff --git a/source/libs/sync/src/syncSnapshot.c b/source/libs/sync/src/syncSnapshot.c
index 924a4df90d..279a70cb19 100644
--- a/source/libs/sync/src/syncSnapshot.c
+++ b/source/libs/sync/src/syncSnapshot.c
@@ -573,6 +573,12 @@ static int32_t snapshotReceiverFinish(SSyncSnapshotReceiver *pReceiver, SyncSnap
       pReceiver->pSyncNode->commitIndex = pReceiver->snapshot.lastApplyIndex;
     }
 
+    // maybe update term
+    if (pReceiver->snapshot.lastApplyTerm > pReceiver->pSyncNode->pRaftStore->currentTerm) {
+      pReceiver->pSyncNode->pRaftStore->currentTerm = pReceiver->snapshot.lastApplyTerm;
+      raftStorePersist(pReceiver->pSyncNode->pRaftStore);
+    }
+
     // stop writer, apply data
     code = pReceiver->pSyncNode->pFsm->FpSnapshotStopWrite(pReceiver->pSyncNode->pFsm, pReceiver->pWriter, true,
                                                            &(pReceiver->snapshot));
-- 
GitLab