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

fix/TD-32863-add-creating-hash-change-lock

This commit is contained in:
dmchen 2024-11-13 16:07:45 +08:00
parent 0b9f158174
commit 7ff6884779
1 changed files with 33 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
source/dnode/mgmt/mgmt_vnode/src/vmInt.c
View File

@ -16,6 +16,7 @@
#define _DEFAULT_SOURCE #define _DEFAULT_SOURCE
#include "vmInt.h" #include "vmInt.h"
#include "libs/function/tudf.h" #include "libs/function/tudf.h"
#include "osMemory.h"
#include "tfs.h" #include "tfs.h"
#include "vnd.h" #include "vnd.h"
@ -87,17 +88,15 @@ int32_t vmAllocPrimaryDisk(SVnodeMgmt *pMgmt, int32_t vgId) {
} }
} }
code = taosThreadMutexUnlock(&pMgmt->mutex);
if (code != 0) {
goto _OVER;
}
(void)taosThreadRwlockWrlock(&pMgmt->lock);
SVnodeObj *pCreatingVnode = taosMemoryCalloc(1, sizeof(SVnodeObj)); SVnodeObj *pCreatingVnode = taosMemoryCalloc(1, sizeof(SVnodeObj));
if (pCreatingVnode == NULL) { if (pCreatingVnode == NULL) {
(void)taosThreadRwlockUnlock(&pMgmt->lock); code = -1;
dError("failed to alloc vnode since %s", terrstr()); if (terrno != 0) code = terrno;
dError("failed to alloc vnode since %s", tstrerror(code));
int32_t r = taosThreadMutexUnlock(&pMgmt->mutex);
if (r != 0) {
dError("vgId:%d, failed to unlock mutex since %s", vgId, tstrerror(r));
}
goto _OVER; goto _OVER;
} }
(void)memset(pCreatingVnode, 0, sizeof(SVnodeObj)); (void)memset(pCreatingVnode, 0, sizeof(SVnodeObj));
@ -105,12 +104,32 @@ int32_t vmAllocPrimaryDisk(SVnodeMgmt *pMgmt, int32_t vgId) {
pCreatingVnode->vgId = vgId; pCreatingVnode->vgId = vgId;
pCreatingVnode->diskPrimary = diskId; pCreatingVnode->diskPrimary = diskId;
dTrace("vgId:%d, put vnode into creating hash, pCreatingVnode:%p", vgId, pCreatingVnode); code = taosThreadRwlockWrlock(&pMgmt->lock);
int32_t r = taosHashPut(pMgmt->creatingHash, &vgId, sizeof(int32_t), &pCreatingVnode, sizeof(SVnodeObj *)); if (code != 0) {
int32_t r = taosThreadMutexUnlock(&pMgmt->mutex);
if (r != 0) { if (r != 0) {
dError("vgId:%d, failed to put vnode to creatingHash", vgId); dError("vgId:%d, failed to unlock mutex since %s", vgId, tstrerror(r));
}
taosMemoryFree(pCreatingVnode);
goto _OVER;
}
dTrace("vgId:%d, put vnode into creating hash, pCreatingVnode:%p", vgId, pCreatingVnode);
code = taosHashPut(pMgmt->creatingHash, &vgId, sizeof(int32_t), &pCreatingVnode, sizeof(SVnodeObj *));
if (code != 0) {
dError("vgId:%d, failed to put vnode to creatingHash", vgId);
taosMemoryFree(pCreatingVnode);
}
int32_t r = taosThreadRwlockUnlock(&pMgmt->lock);
if (r != 0) {
dError("vgId:%d, failed to unlock since %s", vgId, tstrerror(r));
}
code = taosThreadMutexUnlock(&pMgmt->mutex);
if (code != 0) {
goto _OVER;
} }
(void)taosThreadRwlockUnlock(&pMgmt->lock);
_OVER: _OVER: