From 39848d24f93b22084af6b8477bc7aee76e8c5cf6 Mon Sep 17 00:00:00 2001
From: dapan1121 <wpan@taosdata.com>
Date: Tue, 7 Jun 2022 09:34:47 +0800
Subject: [PATCH] fix catalog quit issue

---
 source/libs/catalog/src/catalog.c  |  8 +++----
 source/libs/catalog/src/ctgCache.c | 36 +++++++++++++++++++-----------
 2 files changed, 27 insertions(+), 17 deletions(-)

diff --git a/source/libs/catalog/src/catalog.c b/source/libs/catalog/src/catalog.c
index 461cfa4d7e..270d0b5f13 100644
--- a/source/libs/catalog/src/catalog.c
+++ b/source/libs/catalog/src/catalog.c
@@ -1186,13 +1186,13 @@ void catalogDestroy(void) {
 
   atomic_store_8((int8_t*)&gCtgMgmt.exit, true);
 
-  while (CTG_IS_LOCKED(&gCtgMgmt.lock)) {
-    taosUsleep(1);
-  }
-
   if (tsem_post(&gCtgMgmt.queue.reqSem)) {
     qError("tsem_post failed, error:%s", tstrerror(TAOS_SYSTEM_ERROR(errno)));
   }
+
+  while (CTG_IS_LOCKED(&gCtgMgmt.lock)) {
+    taosUsleep(1);
+  }
   
   CTG_LOCK(CTG_WRITE, &gCtgMgmt.lock);
 
diff --git a/source/libs/catalog/src/ctgCache.c b/source/libs/catalog/src/ctgCache.c
index 462678f79a..59aab9fd22 100644
--- a/source/libs/catalog/src/ctgCache.c
+++ b/source/libs/catalog/src/ctgCache.c
@@ -1614,23 +1614,32 @@ void ctgUpdateThreadUnexpectedStopped(void) {
 }
 
 void ctgCleanupCacheQueue(void) {
-  SCtgQNode *node = gCtgMgmt.queue.head->next;
+  SCtgQNode *node = NULL;
   SCtgQNode *nodeNext = NULL;
-  
-  while (node) {
-    if (node->op) {
-      taosMemoryFree(node->op->data);
-      if (node->op->syncOp) {
-        tsem_post(&node->op->rspSem);
-      } else {
-        taosMemoryFree(node->op);
+
+  while (true) {
+    node = gCtgMgmt.queue.head->next;
+    while (node) {
+      if (node->op) {
+        taosMemoryFree(node->op->data);
+        if (node->op->syncOp) {
+          tsem_post(&node->op->rspSem);
+        } else {
+          taosMemoryFree(node->op);
+        }
       }
+
+      nodeNext = node->next;
+      taosMemoryFree(node);
+      
+      node = nodeNext;
     }
 
-    nodeNext = node->next;
-    taosMemoryFree(node);
-    
-    node = nodeNext;
+    if (CTG_IS_LOCKED(&gCtgMgmt.lock)) {
+      taosUsleep(1);
+    } else {
+      break;
+    }
   }
 
   taosMemoryFreeClear(gCtgMgmt.queue.head);
@@ -1652,6 +1661,7 @@ void* ctgUpdateThreadFunc(void* param) {
     }
     
     if (atomic_load_8((int8_t*)&gCtgMgmt.exit)) {
+      CTG_UNLOCK(CTG_READ, &gCtgMgmt.lock);
       ctgCleanupCacheQueue();
       break;
     }