Merge pull request #19968 from taosdata/fix/TD-22393

fix(vnd): zero meta in vnode when closing

source/dnode/vnode/src/inc/vnodeInt.h

@@ -107,7 +107,7 @@ typedef struct STbUidStore STbUidStore;
 #define META_BEGIN_HEAP_NIL        2
 
 int             metaOpen(SVnode* pVnode, SMeta** ppMeta, int8_t rollback);
-int             metaClose(SMeta* pMeta);
+int             metaClose(SMeta** pMeta);
 int             metaBegin(SMeta* pMeta, int8_t fromSys);
 TXN*            metaGetTxn(SMeta* pMeta);
 int             metaCommit(SMeta* pMeta, TXN* txn);

source/dnode/vnode/src/meta/metaOpen.c

@@ -201,7 +201,8 @@ _err:
   return -1;
 }
 
-int metaClose(SMeta *pMeta) {
+int metaClose(SMeta **ppMeta) {
+  SMeta *pMeta = *ppMeta;
   if (pMeta) {
     if (pMeta->pEnv) metaAbort(pMeta);
     if (pMeta->pCache) metaCacheClose(pMeta);
@@ -221,7 +222,8 @@ int metaClose(SMeta *pMeta) {
     if (pMeta->pTbDb) tdbTbClose(pMeta->pTbDb);
     if (pMeta->pEnv) tdbClose(pMeta->pEnv);
     metaDestroyLock(pMeta);
-    taosMemoryFree(pMeta);
+
+    taosMemoryFreeClear(*ppMeta);
   }
 
   return 0;

source/dnode/vnode/src/vnd/vnodeOpen.c

@@ -239,7 +239,7 @@ _err:
   if (pVnode->pWal) walClose(pVnode->pWal);
   if (pVnode->pTsdb) tsdbClose(&pVnode->pTsdb);
   if (pVnode->pSma) smaClose(pVnode->pSma);
-  if (pVnode->pMeta) metaClose(pVnode->pMeta);
+  if (pVnode->pMeta) metaClose(&pVnode->pMeta);
   if (pVnode->pPool) vnodeCloseBufPool(pVnode);
 
   tsem_destroy(&(pVnode->canCommit));
@@ -263,7 +263,7 @@ void vnodeClose(SVnode *pVnode) {
     tqClose(pVnode->pTq);
     if (pVnode->pTsdb) tsdbClose(&pVnode->pTsdb);
     smaClose(pVnode->pSma);
-    metaClose(pVnode->pMeta);
+    if (pVnode->pMeta) metaClose(&pVnode->pMeta);
     vnodeCloseBufPool(pVnode);
     tsem_post(&pVnode->canCommit);
 

source/dnode/vnode/test/tsdbSmaTest.cpp

@@ -283,7 +283,7 @@ TEST(testCase, tSma_metaDB_Put_Get_Del_Test) {
   metaRemoveSmaFromDb(pMeta, indexUid2);
 
   tDestroyTSma(&tSma);
-  metaClose(pMeta);
+  metaClose(&pMeta);
 }
 #endif
 
@@ -577,9 +577,9 @@ TEST(testCase, tSma_Data_Insert_Query_Test) {
   tDestroyTSma(&tSma);
   tfsClose(pTsdb->pTfs);
   tsdbClose(pTsdb);
-  metaClose(pMeta);
+  metaClose(&pMeta);
 }
 
 #endif
 
-#pragma GCC diagnostic pop
\ No newline at end of file
+#pragma GCC diagnostic pop