From 1fc3380019b0be8912d257cba189fe0510973cd2 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Mon, 7 Dec 2020 17:54:13 +0800
Subject: [PATCH] TD-2370

---
 src/util/src/tqueue.c     | 2 +-
 src/vnode/src/vnodeMain.c | 2 +-
 src/vnode/src/vnodeMgmt.c | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/util/src/tqueue.c b/src/util/src/tqueue.c
index c15ae729ed..d72bc5f412 100644
--- a/src/util/src/tqueue.c
+++ b/src/util/src/tqueue.c
@@ -366,7 +366,7 @@ int taosReadQitemFromQset(taos_qset param, int *type, void **pitem, void **phand
         queue->numOfItems--;
         atomic_sub_fetch_32(&qset->numOfItems, 1);
         code = 1;
-        uTrace("item:%p is read out from queue:%p, type:%d items:%d", *pitem, queue, *type, queue->numOfItems);
+        uTrace("item:%p is read out from queue:%p, type:%d items:%d", *pitem, queue, pNode->type, queue->numOfItems);
     } 
 
     pthread_mutex_unlock(&queue->mutex);
diff --git a/src/vnode/src/vnodeMain.c b/src/vnode/src/vnodeMain.c
index e95387b62c..e286a972dc 100644
--- a/src/vnode/src/vnodeMain.c
+++ b/src/vnode/src/vnodeMain.c
@@ -114,7 +114,7 @@ int32_t vnodeDrop(int32_t vgId) {
   // remove from hash, so new messages wont be consumed
   vnodeRemoveFromHash(pVnode);
   vnodeRelease(pVnode);
-  vnodeCleanUp(pVnode);
+  vnodeCleanupInMWorker(pVnode);
 
   return TSDB_CODE_SUCCESS;
 }
diff --git a/src/vnode/src/vnodeMgmt.c b/src/vnode/src/vnodeMgmt.c
index 631ec13ee8..cf42690d7d 100644
--- a/src/vnode/src/vnodeMgmt.c
+++ b/src/vnode/src/vnodeMgmt.c
@@ -114,7 +114,7 @@ void vnodeRelease(void *vparam) {
     }
   } else {
     vDebug("vgId:%d, vnode will be destroyed, refCount:%d pVnode:%p", pVnode->vgId, refCount, pVnode);
-    vnodeDestroy(pVnode);
+    vnodeDestroyInMWorker(pVnode);
     int32_t count = taosHashGetSize(tsVnodesHash);
     vDebug("vgId:%d, vnode is destroyed, vnodes:%d", pVnode->vgId, count);
   }
-- 
GitLab