From 4b4f7a44f400465c46e41c81f641bbe6374a299a Mon Sep 17 00:00:00 2001
From: Benguang Zhao <bgzhao@taosdata.com>
Date: Wed, 28 Sep 2022 17:39:22 +0800
Subject: [PATCH] fix: resolve memory leak in vnodeOpen when vnodeSyncOpen
 failure

---
 source/dnode/vnode/src/tsdb/tsdbOpen.c    | 2 ++
 source/dnode/vnode/src/vnd/vnodeBufPool.c | 6 +++++-
 source/dnode/vnode/src/vnd/vnodeOpen.c    | 1 +
 3 files changed, 8 insertions(+), 1 deletion(-)

diff --git a/source/dnode/vnode/src/tsdb/tsdbOpen.c b/source/dnode/vnode/src/tsdb/tsdbOpen.c
index ec760e3c57..fcbcff9248 100644
--- a/source/dnode/vnode/src/tsdb/tsdbOpen.c
+++ b/source/dnode/vnode/src/tsdb/tsdbOpen.c
@@ -85,6 +85,8 @@ _err:
 int tsdbClose(STsdb **pTsdb) {
   if (*pTsdb) {
     taosThreadRwlockDestroy(&(*pTsdb)->rwLock);
+    tsdbMemTableDestroy((*pTsdb)->mem);
+    (*pTsdb)->mem = NULL;
     tsdbFSClose(*pTsdb);
     tsdbCloseCache(*pTsdb);
     taosMemoryFreeClear(*pTsdb);
diff --git a/source/dnode/vnode/src/vnd/vnodeBufPool.c b/source/dnode/vnode/src/vnd/vnodeBufPool.c
index 5a22114ab4..6e02425b55 100644
--- a/source/dnode/vnode/src/vnd/vnodeBufPool.c
+++ b/source/dnode/vnode/src/vnd/vnodeBufPool.c
@@ -53,6 +53,10 @@ int vnodeCloseBufPool(SVnode *pVnode) {
     vnodeBufPoolDestroy(pPool);
   }
 
+  if (pVnode->inUse) {
+    vnodeBufPoolDestroy(pVnode->inUse);
+    pVnode->inUse = NULL;
+  }
   vDebug("vgId:%d, vnode buffer pool is closed", TD_VID(pVnode));
 
   return 0;
@@ -177,4 +181,4 @@ void vnodeBufPoolUnRef(SVBufPool *pPool) {
 
     taosThreadMutexUnlock(&pVnode->mutex);
   }
-}
\ No newline at end of file
+}
diff --git a/source/dnode/vnode/src/vnd/vnodeOpen.c b/source/dnode/vnode/src/vnd/vnodeOpen.c
index 69785570f7..b5307cecf2 100644
--- a/source/dnode/vnode/src/vnd/vnodeOpen.c
+++ b/source/dnode/vnode/src/vnd/vnodeOpen.c
@@ -173,6 +173,7 @@ _err:
   if (pVnode->pTsdb) tsdbClose(&pVnode->pTsdb);
   if (pVnode->pSma) smaClose(pVnode->pSma);
   if (pVnode->pMeta) metaClose(pVnode->pMeta);
+  if (pVnode->pPool) vnodeCloseBufPool(pVnode);
 
   tsem_destroy(&(pVnode->canCommit));
   taosMemoryFree(pVnode);
-- 
GitLab