From 59b10f414ce58bf70d01a80f4beeaf9d3a565e28 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Thu, 26 Dec 2024 10:10:21 +0800
Subject: [PATCH] fix: catalog dbg issue

---
 source/libs/catalog/src/catalog.c | 2 ++
 source/libs/catalog/src/ctgDbg.c  | 8 ++++++++
 2 files changed, 10 insertions(+)

diff --git a/source/libs/catalog/src/catalog.c b/source/libs/catalog/src/catalog.c
index a0a4cb301c..2e16b0968a 100644
--- a/source/libs/catalog/src/catalog.c
+++ b/source/libs/catalog/src/catalog.c
@@ -1987,11 +1987,13 @@ void catalogDestroy(void) {
 
   if (gCtgMgmt.cacheTimer) {
     if (!taosTmrStop(gCtgMgmt.cacheTimer)) {
+/*
       qDebug("catalog cacheTimer %" PRIuPTR " not stopped", (uintptr_t)gCtgMgmt.cacheTimer);
     
       while (!taosTmrIsStopped(&gCtgMgmt.cacheTimer)) {
         taosMsleep(1);
       }
+*/
     }
 
     qDebug("catalog cacheTimer %" PRIuPTR " is stopped", (uintptr_t)gCtgMgmt.cacheTimer);
diff --git a/source/libs/catalog/src/ctgDbg.c b/source/libs/catalog/src/ctgDbg.c
index f3a0b04457..a1512f8fd9 100644
--- a/source/libs/catalog/src/ctgDbg.c
+++ b/source/libs/catalog/src/ctgDbg.c
@@ -480,6 +480,8 @@ void ctgdShowDBCache(SCatalog *pCtg, SHashObj *dbHash) {
 
     dbCache = (SCtgDBCache *)pIter;
 
+    CTG_LOCK(CTG_READ, &dbCache->dbLock);
+
     dbFName = taosHashGetKey(pIter, &len);
 
     int32_t metaNum = dbCache->tbCache ? taosHashGetSize(dbCache->tbCache) : 0;
@@ -509,6 +511,8 @@ void ctgdShowDBCache(SCatalog *pCtg, SHashObj *dbHash) {
              hashMethod, hashPrefix, hashSuffix, vgNum);
 
     if (dbCache->vgCache.vgInfo) {
+      CTG_LOCK(CTG_READ, &dbCache->vgCache.vgLock);
+
       int32_t i = 0;
       void *pVgIter = taosHashIterate(dbCache->vgCache.vgInfo->vgHash, NULL);
       while (pVgIter) {
@@ -524,6 +528,8 @@ void ctgdShowDBCache(SCatalog *pCtg, SHashObj *dbHash) {
         
         pVgIter = taosHashIterate(dbCache->vgCache.vgInfo->vgHash, pVgIter);      
       }
+
+      CTG_UNLOCK(CTG_READ, &dbCache->vgCache.vgLock);
     }
 
     if (dbCache->cfgCache.cfgInfo) {
@@ -544,6 +550,8 @@ void ctgdShowDBCache(SCatalog *pCtg, SHashObj *dbHash) {
                pCfg->schemaless, pCfg->sstTrigger);
     }
 
+    CTG_UNLOCK(CTG_READ, &dbCache->dbLock);
+
     ++i;
     pIter = taosHashIterate(dbHash, pIter);
   }