From 24ebb2f5473b2328c7134511e1d8d204e8672d57 Mon Sep 17 00:00:00 2001
From: Benguang Zhao <bgzhao@taosdata.com>
Date: Wed, 8 Mar 2023 17:34:24 +0800
Subject: [PATCH] enh: no need to wait for emptying apply queue in
 syncNodePreClose

---
 source/dnode/mgmt/mgmt_vnode/src/vmInt.c |  2 +-
 source/libs/sync/src/syncMain.c          | 15 +++++----------
 2 files changed, 6 insertions(+), 11 deletions(-)

diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
index 8008e5f810..0524e2713a 100644
--- a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
+++ b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c
@@ -124,7 +124,7 @@ void vmCloseVnode(SVnodeMgmt *pMgmt, SVnodeObj *pVnode, bool commitAndRemoveWal)
   vmFreeQueue(pMgmt, pVnode);
 
   if (commitAndRemoveWal) {
-    dInfo("vgId:%d, commit data", pVnode->vgId);
+    dInfo("vgId:%d, commit data for vnode split", pVnode->vgId);
     vnodeSyncCommit(pVnode->pImpl);
     vnodeBegin(pVnode->pImpl);
     dInfo("vgId:%d, commit data finished", pVnode->vgId);
diff --git a/source/libs/sync/src/syncMain.c b/source/libs/sync/src/syncMain.c
index 9601cd6ab0..a19ad299be 100644
--- a/source/libs/sync/src/syncMain.c
+++ b/source/libs/sync/src/syncMain.c
@@ -1082,21 +1082,15 @@ void syncNodePreClose(SSyncNode* pSyncNode) {
   ASSERT(pSyncNode->pFsm != NULL);
   ASSERT(pSyncNode->pFsm->FpApplyQueueItems != NULL);
 
-  while (1) {
-    int32_t aqItems = pSyncNode->pFsm->FpApplyQueueItems(pSyncNode->pFsm);
-    sTrace("vgId:%d, pre close, %d items in apply queue", pSyncNode->vgId, aqItems);
-    if (aqItems == 0 || aqItems == -1) {
-      break;
-    }
-    taosMsleep(20);
-  }
-
   // stop elect timer
   syncNodeStopElectTimer(pSyncNode);
 
   // stop heartbeat timer
   syncNodeStopHeartbeatTimer(pSyncNode);
 
+  // stop ping timer
+  syncNodeStopPingTimer(pSyncNode);
+
   // clean rsp
   syncRespCleanRsp(pSyncNode->pSyncRespMgr);
 }
@@ -1120,10 +1114,11 @@ void syncNodeClose(SSyncNode* pSyncNode) {
   if (pSyncNode == NULL) return;
   sNInfo(pSyncNode, "sync close, node:%p", pSyncNode);
 
+  syncRespCleanRsp(pSyncNode->pSyncRespMgr);
+
   syncNodeStopPingTimer(pSyncNode);
   syncNodeStopElectTimer(pSyncNode);
   syncNodeStopHeartbeatTimer(pSyncNode);
-
   syncNodeLogReplMgrDestroy(pSyncNode);
 
   syncRespMgrDestroy(pSyncNode->pSyncRespMgr);
-- 
GitLab