From 926c28f62f740d8194f8885a5f6e59d6982e0a14 Mon Sep 17 00:00:00 2001
From: Benguang Zhao <bgzhao@taosdata.com>
Date: Mon, 11 Dec 2023 19:08:22 +0800
Subject: [PATCH 1/2] enh: clear info data of snap sender and receiver at stop

---
 source/libs/sync/src/syncSnapshot.c | 49 ++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 15 deletions(-)

diff --git a/source/libs/sync/src/syncSnapshot.c b/source/libs/sync/src/syncSnapshot.c
index cbdc60b2b3..53d91d15ec 100644
--- a/source/libs/sync/src/syncSnapshot.c
+++ b/source/libs/sync/src/syncSnapshot.c
@@ -107,6 +107,19 @@ void syncSnapBlockDestroy(void *ptr) {
   taosMemoryFree(pBlk);
 }
 
+static int32_t snapshotSenderClearInfoData(SSyncSnapshotSender *pSender) {
+  if (pSender->snapshotParam.data) {
+    taosMemoryFree(pSender->snapshotParam.data);
+    pSender->snapshotParam.data = NULL;
+  }
+
+  if (pSender->snapshot.data) {
+    taosMemoryFree(pSender->snapshot.data);
+    pSender->snapshot.data = NULL;
+  }
+  return 0;
+}
+
 void snapshotSenderDestroy(SSyncSnapshotSender *pSender) {
   if (pSender == NULL) return;
 
@@ -121,10 +134,8 @@ void snapshotSenderDestroy(SSyncSnapshotSender *pSender) {
     syncSnapBufferDestroy(&pSender->pSndBuf);
   }
 
-  if (pSender->snapshotParam.data) {
-    taosMemoryFree(pSender->snapshotParam.data);
-    pSender->snapshotParam.data = NULL;
-  }
+  snapshotSenderClearInfoData(pSender);
+
   // free sender
   taosMemoryFree(pSender);
 }
@@ -209,6 +220,8 @@ void snapshotSenderStop(SSyncSnapshotSender *pSender, bool finish) {
 
     syncSnapBufferReset(pSender->pSndBuf);
 
+    snapshotSenderClearInfoData(pSender);
+
     SRaftId destId = pSender->pSyncNode->replicasId[pSender->replicaIndex];
     sSInfo(pSender, "snapshot sender stop, to dnode:%d, finish:%d", DID(&destId), finish);
   }
@@ -419,6 +432,19 @@ SSyncSnapshotReceiver *snapshotReceiverCreate(SSyncNode *pSyncNode, SRaftId from
   return pReceiver;
 }
 
+static int32_t snapshotReceiverClearInfoData(SSyncSnapshotReceiver *pReceiver) {
+  if (pReceiver->snapshotParam.data) {
+    taosMemoryFree(pReceiver->snapshotParam.data);
+    pReceiver->snapshotParam.data = NULL;
+  }
+
+  if (pReceiver->snapshot.data) {
+    taosMemoryFree(pReceiver->snapshot.data);
+    pReceiver->snapshot.data = NULL;
+  }
+  return 0;
+}
+
 void snapshotReceiverDestroy(SSyncSnapshotReceiver *pReceiver) {
   if (pReceiver == NULL) return;
 
@@ -432,22 +458,13 @@ void snapshotReceiverDestroy(SSyncSnapshotReceiver *pReceiver) {
     pReceiver->pWriter = NULL;
   }
 
-  // free data of snapshot info
-  if (pReceiver->snapshotParam.data) {
-    taosMemoryFree(pReceiver->snapshotParam.data);
-    pReceiver->snapshotParam.data = NULL;
-  }
-
-  if (pReceiver->snapshot.data) {
-    taosMemoryFree(pReceiver->snapshot.data);
-    pReceiver->snapshot.data = NULL;
-  }
-
   // free snap buf
   if (pReceiver->pRcvBuf) {
     syncSnapBufferDestroy(&pReceiver->pRcvBuf);
   }
 
+  snapshotReceiverClearInfoData(pReceiver);
+
   // free receiver
   taosMemoryFree(pReceiver);
 }
@@ -533,6 +550,8 @@ void snapshotReceiverStop(SSyncSnapshotReceiver *pReceiver) {
     }
 
     syncSnapBufferReset(pReceiver->pRcvBuf);
+
+    snapshotReceiverClearInfoData(pReceiver);
   }
   taosThreadMutexUnlock(&pReceiver->pRcvBuf->mutex);
 }

From 41ef6075e2c807ae6867ddebfc28ee6b05c13246 Mon Sep 17 00:00:00 2001
From: Benguang Zhao <bgzhao@taosdata.com>
Date: Mon, 11 Dec 2023 15:48:06 +0800
Subject: [PATCH 2/2] enh: check result of FpGetSnapshotInfo for exchange snap
 info

---
 source/libs/sync/src/syncSnapshot.c | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/source/libs/sync/src/syncSnapshot.c b/source/libs/sync/src/syncSnapshot.c
index 53d91d15ec..f060e9da13 100644
--- a/source/libs/sync/src/syncSnapshot.c
+++ b/source/libs/sync/src/syncSnapshot.c
@@ -683,7 +683,10 @@ static int32_t syncSnapReceiverExchgSnapInfo(SSyncNode *pSyncNode, SSyncSnapshot
   memcpy(pInfo->data, pMsg->data, pMsg->dataLen);
 
   // exchange snap info
-  pSyncNode->pFsm->FpGetSnapshotInfo(pSyncNode->pFsm, pInfo);
+  if (pSyncNode->pFsm->FpGetSnapshotInfo(pSyncNode->pFsm, pInfo) != 0) {
+    sRError(pReceiver, "failed to get snapshot info. type: %d", pMsg->payloadType);
+    goto _out;
+  }
   SSyncTLV *datHead = pInfo->data;
   if (datHead->typ != TDMT_SYNC_PREP_SNAPSHOT_REPLY) {
     sRError(pReceiver, "unexpected data typ in data of snapshot info. typ: %d", datHead->typ);