From 6c3508150738ef1c6503a15251986d63c1607a4e Mon Sep 17 00:00:00 2001
From: wangmm0220 <wangmm0220@gmail.com>
Date: Tue, 18 Jul 2023 09:54:35 +0800
Subject: [PATCH] fix:add sdbFetchCancel to release hash node

---
 source/dnode/mnode/impl/src/mndCluster.c   | 1 -
 source/dnode/mnode/impl/src/mndDb.c        | 3 +--
 source/dnode/mnode/impl/src/mndIndex.c     | 2 +-
 source/dnode/mnode/impl/src/mndQnode.c     | 1 +
 source/dnode/mnode/impl/src/mndScheduler.c | 1 +
 source/dnode/mnode/impl/src/mndStb.c       | 3 +++
 source/dnode/mnode/impl/src/mndUser.c      | 4 ----
 7 files changed, 7 insertions(+), 8 deletions(-)

diff --git a/source/dnode/mnode/impl/src/mndCluster.c b/source/dnode/mnode/impl/src/mndCluster.c
index 67675b5400..aa00580c93 100644
--- a/source/dnode/mnode/impl/src/mndCluster.c
+++ b/source/dnode/mnode/impl/src/mndCluster.c
@@ -77,7 +77,6 @@ static SClusterObj *mndAcquireCluster(SMnode *pMnode, void **ppIter) {
     if (pIter == NULL) break;
 
     *ppIter = pIter;
-    sdbCancelFetch(pSdb, pIter);
     return pCluster;
   }
 
diff --git a/source/dnode/mnode/impl/src/mndDb.c b/source/dnode/mnode/impl/src/mndDb.c
index 5e45c7b242..87383265d9 100644
--- a/source/dnode/mnode/impl/src/mndDb.c
+++ b/source/dnode/mnode/impl/src/mndDb.c
@@ -1303,11 +1303,10 @@ static void mndBuildDBVgroupInfo(SDbObj *pDb, SMnode *pMnode, SArray *pVgList) {
     sdbRelease(pSdb, pVgroup);
 
     if (pDb && (vindex >= pDb->cfg.numOfVgroups)) {
+      sdbCancelFetch(pSdb, pIter);
       break;
     }
   }
-
-  sdbCancelFetch(pSdb, pIter);
 }
 
 int32_t mndExtractDbInfo(SMnode *pMnode, SDbObj *pDb, SUseDbRsp *pRsp, const SUseDbReq *pReq) {
diff --git a/source/dnode/mnode/impl/src/mndIndex.c b/source/dnode/mnode/impl/src/mndIndex.c
index 8f977dacb7..c3e95a2d1f 100644
--- a/source/dnode/mnode/impl/src/mndIndex.c
+++ b/source/dnode/mnode/impl/src/mndIndex.c
@@ -852,7 +852,7 @@ int32_t mndDropIdxsByDb(SMnode *pMnode, STrans *pTrans, SDbObj *pDb) {
     if (pIdx->dbUid == pDb->uid) {
       if (mndSetDropIdxCommitLogs(pMnode, pTrans, pIdx) != 0) {
         sdbRelease(pSdb, pIdx);
-        sdbCancelFetch(pSdb, pIdx);
+        sdbCancelFetch(pSdb, pIter);
         return -1;
       }
     }
diff --git a/source/dnode/mnode/impl/src/mndQnode.c b/source/dnode/mnode/impl/src/mndQnode.c
index b5c9ce1f65..5ec81440bb 100644
--- a/source/dnode/mnode/impl/src/mndQnode.c
+++ b/source/dnode/mnode/impl/src/mndQnode.c
@@ -454,6 +454,7 @@ int32_t mndCreateQnodeList(SMnode *pMnode, SArray **pList, int32_t limit) {
     sdbRelease(pSdb, pObj);
 
     if (limit > 0 && numOfRows >= limit) {
+      sdbCancelFetch(pSdb, pIter);
       break;
     }
   }
diff --git a/source/dnode/mnode/impl/src/mndScheduler.c b/source/dnode/mnode/impl/src/mndScheduler.c
index b95f4d6a00..dbac9ec9bb 100644
--- a/source/dnode/mnode/impl/src/mndScheduler.c
+++ b/source/dnode/mnode/impl/src/mndScheduler.c
@@ -198,6 +198,7 @@ SVgObj* mndSchedFetchOneVg(SMnode* pMnode, int64_t dbUid) {
       sdbRelease(pMnode->pSdb, pVgroup);
       continue;
     }
+    sdbCancelFetch(pMnode->pSdb, pIter);
     return pVgroup;
   }
   return pVgroup;
diff --git a/source/dnode/mnode/impl/src/mndStb.c b/source/dnode/mnode/impl/src/mndStb.c
index c1186d068f..e8af02a828 100644
--- a/source/dnode/mnode/impl/src/mndStb.c
+++ b/source/dnode/mnode/impl/src/mndStb.c
@@ -2330,6 +2330,7 @@ static int32_t mndCheckDropStbForStream(SMnode *pMnode, const char *stbFullName,
     }
 
     if (pStream->targetStbUid == suid) {
+      sdbCancelFetch(pSdb, pIter);
       sdbRelease(pSdb, pStream);
       return -1;
     }
@@ -2338,6 +2339,7 @@ static int32_t mndCheckDropStbForStream(SMnode *pMnode, const char *stbFullName,
     if (nodesStringToNode(pStream->ast, &pAst) != 0) {
       terrno = TSDB_CODE_MND_INVALID_STREAM_OPTION;
       mError("stream:%s, create ast error", pStream->name);
+      sdbCancelFetch(pSdb, pIter);
       sdbRelease(pSdb, pStream);
       return -1;
     }
@@ -2349,6 +2351,7 @@ static int32_t mndCheckDropStbForStream(SMnode *pMnode, const char *stbFullName,
       SColumnNode *pCol = (SColumnNode *)pNode;
 
       if (pCol->tableId == suid) {
+        sdbCancelFetch(pSdb, pIter);
         sdbRelease(pSdb, pStream);
         nodesDestroyNode(pAst);
         nodesDestroyList(pNodeList);
diff --git a/source/dnode/mnode/impl/src/mndUser.c b/source/dnode/mnode/impl/src/mndUser.c
index d3b2ef7344..999431a5fb 100644
--- a/source/dnode/mnode/impl/src/mndUser.c
+++ b/source/dnode/mnode/impl/src/mndUser.c
@@ -1445,7 +1445,6 @@ int32_t mndUserRemoveDb(SMnode *pMnode, STrans *pTrans, char *db) {
 
     code = -1;
     if (mndUserDupObj(pUser, &newUser) != 0) {
-      sdbCancelFetch(pSdb, pIter);
       break;
     }
 
@@ -1457,7 +1456,6 @@ int32_t mndUserRemoveDb(SMnode *pMnode, STrans *pTrans, char *db) {
 
       SSdbRaw *pCommitRaw = mndUserActionEncode(&newUser);
       if (pCommitRaw == NULL || mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) {
-        sdbCancelFetch(pSdb, pIter);
         break;
       }
       (void)sdbSetRawStatus(pCommitRaw, SDB_STATUS_READY);
@@ -1490,7 +1488,6 @@ int32_t mndUserRemoveTopic(SMnode *pMnode, STrans *pTrans, char *topic) {
 
     code = -1;
     if (mndUserDupObj(pUser, &newUser) != 0) {
-      sdbCancelFetch(pSdb, pIter);
       break;
     }
 
@@ -1499,7 +1496,6 @@ int32_t mndUserRemoveTopic(SMnode *pMnode, STrans *pTrans, char *topic) {
       (void)taosHashRemove(newUser.topics, topic, len);
       SSdbRaw *pCommitRaw = mndUserActionEncode(&newUser);
       if (pCommitRaw == NULL || mndTransAppendCommitlog(pTrans, pCommitRaw) != 0) {
-        sdbCancelFetch(pSdb, pIter);
         break;
       }
       (void)sdbSetRawStatus(pCommitRaw, SDB_STATUS_READY);
-- 
GitLab