From 4d85866d1826f5f665ac16cdf6a08d401fed3116 Mon Sep 17 00:00:00 2001
From: dmchen <cademfly@hotmail.com>
Date: Mon, 21 Oct 2024 10:21:59 +0000
Subject: [PATCH] fix/TS-5532-set-seperate-thread-update-status-fix-case

---
 source/dnode/mgmt/mgmt_dnode/src/dmWorker.c | 14 --------------
 source/dnode/mgmt/node_mgmt/src/dmMgmt.c    | 18 ++++++++++++++++++
 2 files changed, 18 insertions(+), 14 deletions(-)

diff --git a/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c b/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c
index 7fc9920816..7f802f3837 100644
--- a/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c
+++ b/source/dnode/mgmt/mgmt_dnode/src/dmWorker.c
@@ -47,7 +47,6 @@ static void *dmStatusThreadFp(void *param) {
   return NULL;
 }
 
-extern SMonVloadInfo tsVinfo;
 static void *dmStatusInfoThreadFp(void *param) {
   SDnodeMgmt *pMgmt = param;
   int64_t     lastTime = taosGetTimestampMs();
@@ -73,19 +72,6 @@ static void *dmStatusInfoThreadFp(void *param) {
       }
     }
   }
-  dDebug("begin to lock status info when thread exit");
-  if (taosThreadMutexLock(&pMgmt->pData->statusInfolock) != 0) {
-    dError("failed to lock status info lock");
-    return NULL;
-  }
-  if (tsVinfo.pVloads != NULL) {
-    taosArrayDestroy(tsVinfo.pVloads);
-    tsVinfo.pVloads = NULL;
-  }
-  if (taosThreadMutexUnlock(&pMgmt->pData->statusInfolock) != 0) {
-    dError("failed to unlock status info lock");
-    return NULL;
-  }
 
   return NULL;
 }
diff --git a/source/dnode/mgmt/node_mgmt/src/dmMgmt.c b/source/dnode/mgmt/node_mgmt/src/dmMgmt.c
index 5e4f7163e7..1d6bbfa098 100644
--- a/source/dnode/mgmt/node_mgmt/src/dmMgmt.c
+++ b/source/dnode/mgmt/node_mgmt/src/dmMgmt.c
@@ -219,6 +219,7 @@ int32_t dmInitVars(SDnode *pDnode) {
   return 0;
 }
 
+extern SMonVloadInfo tsVinfo;
 void dmClearVars(SDnode *pDnode) {
   for (EDndNodeType ntype = DNODE; ntype < NODE_END; ++ntype) {
     SMgmtWrapper *pWrapper = &pDnode->wrappers[ntype];
@@ -254,6 +255,23 @@ void dmClearVars(SDnode *pDnode) {
   (void)taosThreadRwlockUnlock(&pData->lock);
 
   (void)taosThreadRwlockDestroy(&pData->lock);
+
+  dDebug("begin to lock status info when thread exit");
+  if (taosThreadMutexLock(&pData->statusInfolock) != 0) {
+    dError("failed to lock status info lock");
+    return;
+  }
+  if (tsVinfo.pVloads != NULL) {
+    taosArrayDestroy(tsVinfo.pVloads);
+    tsVinfo.pVloads = NULL;
+  }
+  if (taosThreadMutexUnlock(&pData->statusInfolock) != 0) {
+    dError("failed to unlock status info lock");
+    return;
+  }
+  taosThreadMutexDestroy(&pData->statusInfolock);
+  memset(&pData->statusInfolock, 0, sizeof(pData->statusInfolock));
+
   (void)taosThreadMutexDestroy(&pDnode->mutex);
   memset(&pDnode->mutex, 0, sizeof(pDnode->mutex));
 }