From 922436e7d487f2a228f05ae628b2861cfeb63393 Mon Sep 17 00:00:00 2001
From: Shengliang Guan <slguan@taosdata.com>
Date: Fri, 21 Oct 2022 19:12:03 +0800
Subject: [PATCH] fix: lock mem items of tqueue

---
 source/dnode/vnode/src/vnd/vnodeSync.c | 4 ++--
 source/util/src/tqueue.c               | 4 ----
 2 files changed, 2 insertions(+), 6 deletions(-)

diff --git a/source/dnode/vnode/src/vnd/vnodeSync.c b/source/dnode/vnode/src/vnd/vnodeSync.c
index 1863203f4a..56f533bf34 100644
--- a/source/dnode/vnode/src/vnd/vnodeSync.c
+++ b/source/dnode/vnode/src/vnd/vnodeSync.c
@@ -519,7 +519,7 @@ static int32_t vnodeSnapshotStartWrite(struct SSyncFSM *pFsm, void *pParam, void
 
   do {
     int32_t itemSize = tmsgGetQueueSize(&pVnode->msgCb, pVnode->config.vgId, APPLY_QUEUE);
-    if (itemSize == 0) {
+    if (itemSize <= 0) {
       vInfo("vgId:%d, start write vnode snapshot since apply queue is empty", pVnode->config.vgId);
       break;
     } else {
@@ -572,7 +572,7 @@ static void vnodeRestoreFinish(struct SSyncFSM *pFsm) {
 
   do {
     int32_t itemSize = tmsgGetQueueSize(&pVnode->msgCb, pVnode->config.vgId, APPLY_QUEUE);
-    if (itemSize == 0) {
+    if (itemSize <= 0) {
       vInfo("vgId:%d, apply queue is empty, restore finish", pVnode->config.vgId);
       break;
     } else {
diff --git a/source/util/src/tqueue.c b/source/util/src/tqueue.c
index 8748f8df3f..f1f926c0b7 100644
--- a/source/util/src/tqueue.c
+++ b/source/util/src/tqueue.c
@@ -141,14 +141,10 @@ int32_t taosQueueItemSize(STaosQueue *queue) {
 }
 
 int64_t taosQueueMemorySize(STaosQueue *queue) {
-#if 1
-  return queue->memOfItems;
-#else
   taosThreadMutexLock(&queue->mutex);
   int64_t memOfItems = queue->memOfItems;
   taosThreadMutexUnlock(&queue->mutex);
   return memOfItems;
-#endif
 }
 
 void *taosAllocateQitem(int32_t size, EQItype itype) {
-- 
GitLab