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

fix/TD-32863-add-creating-hash-fix-case

This commit is contained in:
dmchen 2024-11-13 14:48:57 +08:00
parent 2b069db01f
commit 0b9f158174
1 changed files with 5 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -105,6 +105,7 @@ 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);
int32_t r = taosHashPut(pMgmt->creatingHash, &vgId, sizeof(int32_t), &pCreatingVnode, sizeof(SVnodeObj *)); int32_t r = taosHashPut(pMgmt->creatingHash, &vgId, sizeof(int32_t), &pCreatingVnode, sizeof(SVnodeObj *));
if (r != 0) { if (r != 0) {
dError("vgId:%d, failed to put vnode to creatingHash", vgId); dError("vgId:%d, failed to put vnode to creatingHash", vgId);
@ -556,13 +557,15 @@ static int32_t vmOpenVnodes(SVnodeMgmt *pMgmt) {
void vmRemoveFromCreatingHash(SVnodeMgmt *pMgmt, int32_t vgId) { void vmRemoveFromCreatingHash(SVnodeMgmt *pMgmt, int32_t vgId) {
(void)taosThreadRwlockWrlock(&pMgmt->lock); (void)taosThreadRwlockWrlock(&pMgmt->lock);
SVnodeObj *pOld = NULL; SVnodeObj *pOld = NULL;
int32_t r = taosHashGetDup(pMgmt->closedHash, &vgId, sizeof(int32_t), (void *)&pOld); int32_t r = taosHashGetDup(pMgmt->creatingHash, &vgId, sizeof(int32_t), (void *)&pOld);
if (r != 0) { if (r != 0) {
dError("vgId:%d, failed to get vnode from closedHash", vgId); dError("vgId:%d, failed to get vnode from creating Hash", vgId);
} }
if (pOld) { if (pOld) {
dTrace("vgId:%d, free vnode pOld:%p", vgId, &pOld);
vmFreeVnodeObj(&pOld); vmFreeVnodeObj(&pOld);
} }
dTrace("vgId:%d, remove from creating Hash", vgId);
r = taosHashRemove(pMgmt->creatingHash, &vgId, sizeof(int32_t)); r = taosHashRemove(pMgmt->creatingHash, &vgId, sizeof(int32_t));
if (r != 0) { if (r != 0) {
dError("vgId:%d, failed to remove vnode from hash", vgId); dError("vgId:%d, failed to remove vnode from hash", vgId);