From 81592dfb09bc18b5ecc49e7efb21bf4c03fc32bb Mon Sep 17 00:00:00 2001
From: Minghao Li <castermode@gmail.com>
Date: Wed, 16 Nov 2022 14:25:21 +0800
Subject: [PATCH] fix(sync): fix hb-timer memory leak

---
 source/libs/sync/inc/syncInt.h  | 8 +++-----
 source/libs/sync/src/syncMain.c | 9 ++++-----
 2 files changed, 7 insertions(+), 10 deletions(-)

diff --git a/source/libs/sync/inc/syncInt.h b/source/libs/sync/inc/syncInt.h
index 0507bb3661..b7ca735ade 100644
--- a/source/libs/sync/inc/syncInt.h
+++ b/source/libs/sync/inc/syncInt.h
@@ -56,13 +56,12 @@ typedef struct SRaftId {
   SyncGroupId vgId;
 } SRaftId;
 
-typedef struct SSyncHbTimerParam {
+typedef struct SSyncHbTimerData {
   SSyncNode*  pSyncNode;
   SSyncTimer* pTimer;
   SRaftId     destId;
   uint64_t    logicClock;
-  int64_t     executeTime;
-} SSyncHbTimerParam;
+} SSyncHbTimerData;
 
 typedef struct SSyncTimer {
   void*             pTimer;
@@ -71,7 +70,7 @@ typedef struct SSyncTimer {
   uint64_t          counter;
   int32_t           timerMS;
   SRaftId           destId;
-  void*             pData;
+  SSyncHbTimerData  hbData;
 } SSyncTimer;
 
 typedef struct SElectTimerParam {
@@ -164,7 +163,6 @@ typedef struct SSyncNode {
   uint64_t          heartbeatTimerLogicClockUser;
   TAOS_TMR_CALLBACK FpHeartbeatTimerCB;  // Timer Fp
   uint64_t          heartbeatTimerCounter;
-  SSyncHbTimerParam hbTimerParam;
 
   // peer heartbeat timer
   SSyncTimer peerHeartbeatTimerArr[TSDB_MAX_REPLICA];
diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c
index 7484e93abe..d47bf4f401 100644
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -665,13 +665,12 @@ static int32_t syncHbTimerInit(SSyncNode* pSyncNode, SSyncTimer* pSyncTimer, SRa
 static int32_t syncHbTimerStart(SSyncNode* pSyncNode, SSyncTimer* pSyncTimer) {
   int32_t ret = 0;
   if (syncIsInit()) {
-    SSyncHbTimerParam* pData = taosMemoryMalloc(sizeof(SSyncHbTimerParam));
+    SSyncHbTimerData* pData = &pSyncTimer->hbData;
     pData->pSyncNode = pSyncNode;
     pData->pTimer = pSyncTimer;
     pData->destId = pSyncTimer->destId;
     pData->logicClock = pSyncTimer->logicClock;
 
-    pSyncTimer->pData = pData;
     taosTmrReset(pSyncTimer->timerCb, pSyncTimer->timerMS, pData, syncEnv()->pTimerManager, &pSyncTimer->pTimer);
   } else {
     sError("vgId:%d, start ctrl hb timer error, sync env is stop", pSyncNode->vgId);
@@ -1930,9 +1929,9 @@ static void syncNodeEqHeartbeatTimer(void* param, void* tmrId) {
 }
 
 static void syncNodeEqPeerHeartbeatTimer(void* param, void* tmrId) {
-  SSyncHbTimerParam* pData = (SSyncHbTimerParam*)param;
-  SSyncNode*         pSyncNode = pData->pSyncNode;
-  SSyncTimer*        pSyncTimer = pData->pTimer;
+  SSyncHbTimerData* pData = (SSyncHbTimerData*)param;
+  SSyncNode*        pSyncNode = pData->pSyncNode;
+  SSyncTimer*       pSyncTimer = pData->pTimer;
 
   if (pSyncNode == NULL) {
     return;