xxq250
/
homework-jianmu
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

fix/TS-5532-set-seperate-thread-update-status-fix-case

This commit is contained in:
dmchen 2024-10-21 06:19:04 +00:00
parent f82cd9e2da
commit 7050277360
2 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
View File

@ -169,7 +169,7 @@ void dmSendStatusReq(SDnodeMgmt *pMgmt) {
dError("failed to lock status info lock"); dError("failed to lock status info lock");
return; return;
} }
taosArraySwap(req.pVloads, tsVinfo.pVloads); req.pVloads = tsVinfo.pVloads;
tsVinfo.pVloads = NULL; tsVinfo.pVloads = NULL;
if (taosThreadMutexUnlock(&pMgmt->pData->statusInfolock) != 0) { if (taosThreadMutexUnlock(&pMgmt->pData->statusInfolock) != 0) {
dError("failed to unlock status info lock"); dError("failed to unlock status info lock");
@ -244,12 +244,14 @@ void dmUpdateStatusInfo(SDnodeMgmt *pMgmt) {
SMonVloadInfo vinfo = {0}; SMonVloadInfo vinfo = {0};
dDebug("begin to get vnode loads"); dDebug("begin to get vnode loads");
(*pMgmt->getVnodeLoadsFp)(&vinfo); (*pMgmt->getVnodeLoadsFp)(&vinfo);
dDebug("begin to lock status info");
if (taosThreadMutexLock(&pMgmt->pData->statusInfolock) != 0) { if (taosThreadMutexLock(&pMgmt->pData->statusInfolock) != 0) {
dError("failed to lock status info lock"); dError("failed to lock status info lock");
return; return;
} }
if (tsVinfo.pVloads == NULL) { if (tsVinfo.pVloads == NULL) {
taosArraySwap(tsVinfo.pVloads, vinfo.pVloads); tsVinfo.pVloads = vinfo.pVloads;
vinfo.pVloads = NULL;
} else { } else {
taosArrayDestroy(vinfo.pVloads); taosArrayDestroy(vinfo.pVloads);
vinfo.pVloads = NULL; vinfo.pVloads = NULL;

2
source/dnode/mgmt/mgmt_dnode/src/dmWorker.c
View File

@ -73,7 +73,7 @@ static void *dmStatusInfoThreadFp(void *param) {
} }
} }
} }
dDebug("begin to lock status info when thread exit");
if (taosThreadMutexLock(&pMgmt->pData->statusInfolock) != 0) { if (taosThreadMutexLock(&pMgmt->pData->statusInfolock) != 0) {
dError("failed to lock status info lock"); dError("failed to lock status info lock");
return NULL; return NULL;