From a78556a3e66058bb47aa7b4455a827b8723b8ac7 Mon Sep 17 00:00:00 2001
From: Benguang Zhao <bgzhao@taosdata.com>
Date: Tue, 21 Feb 2023 16:48:15 +0800
Subject: [PATCH] fix: synchronize access to pVnode->inUse

---
 source/dnode/vnode/src/vnd/vnodeBufPool.c |  7 ++++++-
 source/dnode/vnode/src/vnd/vnodeCommit.c  | 24 +++++++++++------------
 2 files changed, 17 insertions(+), 14 deletions(-)

diff --git a/source/dnode/vnode/src/vnd/vnodeBufPool.c b/source/dnode/vnode/src/vnd/vnodeBufPool.c
index 83a414dae0..88abc1b3f0 100644
--- a/source/dnode/vnode/src/vnd/vnodeBufPool.c
+++ b/source/dnode/vnode/src/vnd/vnodeBufPool.c
@@ -94,6 +94,7 @@ int vnodeOpenBufPool(SVnode *pVnode) {
 int vnodeCloseBufPool(SVnode *pVnode) {
   SVBufPool *pPool;
 
+  taosThreadMutexLock(&pVnode->mutex);
   for (pPool = pVnode->pPool; pPool; pPool = pVnode->pPool) {
     pVnode->pPool = pPool->next;
     vnodeBufPoolDestroy(pPool);
@@ -103,8 +104,9 @@ int vnodeCloseBufPool(SVnode *pVnode) {
     vnodeBufPoolDestroy(pVnode->inUse);
     pVnode->inUse = NULL;
   }
-  vDebug("vgId:%d, vnode buffer pool is closed", TD_VID(pVnode));
+  taosThreadMutexUnlock(&pVnode->mutex);
 
+  vDebug("vgId:%d, vnode buffer pool is closed", TD_VID(pVnode));
   return 0;
 }
 
@@ -244,6 +246,9 @@ void vnodeBufPoolUnRef(SVBufPool *pPool) {
     pVnode->pPool = pPool;
     taosThreadCondSignal(&pVnode->poolNotEmpty);
 
+    if (pVnode->inUse == pPool) {
+      pVnode->inUse = NULL;
+    }
     taosThreadMutexUnlock(&pVnode->mutex);
   }
 }
diff --git a/source/dnode/vnode/src/vnd/vnodeCommit.c b/source/dnode/vnode/src/vnd/vnodeCommit.c
index cefa9e6755..e8280ea751 100644
--- a/source/dnode/vnode/src/vnd/vnodeCommit.c
+++ b/source/dnode/vnode/src/vnd/vnodeCommit.c
@@ -87,22 +87,21 @@ void vnodeUpdCommitSched(SVnode *pVnode) {
 }
 
 int vnodeShouldCommit(SVnode *pVnode) {
-  if (!pVnode->inUse || !osDataSpaceAvailable()) {
-    return false;
-  }
-
   SVCommitSched *pSched = &pVnode->commitSched;
   int64_t        nowMs = taosGetMonoTimestampMs();
+  bool           diskAvail = osDataSpaceAvailable();
+  bool           needCommit = false;
 
-  return (((pVnode->inUse->size > pVnode->inUse->node.size) && (pSched->commitMs + SYNC_VND_COMMIT_MIN_MS < nowMs)) ||
-          (pVnode->inUse->size > 0 && pSched->commitMs + pSched->maxWaitMs < nowMs));
-}
-
-int vnodeShouldCommitOld(SVnode *pVnode) {
-  if (pVnode->inUse) {
-    return osDataSpaceAvailable() && (pVnode->inUse->size > pVnode->inUse->node.size);
+  taosThreadMutexLock(&pVnode->mutex);
+  if (!pVnode->inUse || !diskAvail) {
+    goto _out;
   }
-  return false;
+  needCommit =
+      (((pVnode->inUse->size > pVnode->inUse->node.size) && (pSched->commitMs + SYNC_VND_COMMIT_MIN_MS < nowMs)) ||
+       (pVnode->inUse->size > 0 && pSched->commitMs + pSched->maxWaitMs < nowMs));
+_out:
+  taosThreadMutexUnlock(&pVnode->mutex);
+  return needCommit;
 }
 
 int vnodeSaveInfo(const char *dir, const SVnodeInfo *pInfo) {
@@ -259,7 +258,6 @@ static int32_t vnodePrepareCommit(SVnode *pVnode, SCommitInfo *pInfo) {
   metaPrepareAsyncCommit(pVnode->pMeta);
 
   vnodeBufPoolUnRef(pVnode->inUse);
-  pVnode->inUse = NULL;
 
 _exit:
   if (code) {