diff --git a/src/util/src/tqueue.c b/src/util/src/tqueue.c index c15ae729ed06bc21a1f08faa26e23b4b96145d96..d72bc5f4121ec0cd71c1c1dad5d9db5421c66a37 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 e95387b62c64d6852b97fa8af51f670992062d01..e286a972dc97f94613614fdefea273cae7459f26 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 631ec13ee8e0f1569bbedd0ee6647a74efca5c88..cf42690d7d0208f50b781e20a4c7c8885f8c5fba 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); }