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

Merge pull request #27535 from taosdata/fix/TD-31686-remove-avoid-stream 

fix/TD-31686-remove-avoid-stream
This commit is contained in:
Hongze Cheng 2024-08-29 17:17:32 +08:00 committed by GitHub
parent 9e56c7242e 23a8a77dc3
commit 1f87aff1d0
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 4 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/dnode/mnode/impl/src/mndArbGroup.c
View File

@ -404,7 +404,7 @@ static int32_t mndProcessArbHbTimer(SRpcMsg *pReq) {
hbMembers = *(SArray **)pObj; hbMembers = *(SArray **)pObj;
} else { } else {
hbMembers = taosArrayInit(16, sizeof(SVArbHbReqMember)); hbMembers = taosArrayInit(16, sizeof(SVArbHbReqMember));
if (taosHashPut(pDnodeHash, &dnodeId, sizeof(int32_t), &hbMembers, POINTER_BYTES) == 0) { if (taosHashPut(pDnodeHash, &dnodeId, sizeof(int32_t), &hbMembers, POINTER_BYTES) != 0) {
mError("dnodeId:%d, failed to push hb member inty]o hash, but conitnue next at this timer round", dnodeId); mError("dnodeId:%d, failed to push hb member inty]o hash, but conitnue next at this timer round", dnodeId);
} }
} }

12
source/dnode/mnode/impl/src/mndStream.c
View File

@ -2167,17 +2167,9 @@ static int32_t refreshNodeListFromExistedStreams(SMnode *pMnode, SArray *pNodeLi
SNodeEntry entry = {.hbTimestamp = -1, .nodeId = pTask->info.nodeId, .lastHbMsgId = -1}; SNodeEntry entry = {.hbTimestamp = -1, .nodeId = pTask->info.nodeId, .lastHbMsgId = -1};
epsetAssign(&entry.epset, &pTask->info.epSet); epsetAssign(&entry.epset, &pTask->info.epSet);
(void)taosHashPut(pHash, &entry.nodeId, sizeof(entry.nodeId), &entry, sizeof(entry)); if (taosHashPut(pHash, &entry.nodeId, sizeof(entry.nodeId), &entry, sizeof(entry)) != 0) {
/* mError("failed to put entry into hash map, nodeId:%d", entry.nodeId);
if (taosHashPut(pHash, &entry.nodeId, sizeof(entry.nodeId), &entry, sizeof(entry)) == 0) {
code = terrno;
taosWUnLockLatch(&pStream->lock);
sdbRelease(pSdb, pStream);
destroyStreamTaskIter(pTaskIter);
taosArrayClear(pNodeList);
return code;
} }
*/
} }
destroyStreamTaskIter(pTaskIter); destroyStreamTaskIter(pTaskIter);

2
source/dnode/mnode/impl/src/mndTrans.c
View File

@ -768,7 +768,7 @@ void mndTransSetDbName(STrans *pTrans, const char *dbname, const char *stbname)
} }
void mndTransAddArbGroupId(STrans *pTrans, int32_t groupId) { void mndTransAddArbGroupId(STrans *pTrans, int32_t groupId) {
if (taosHashPut(pTrans->arbGroupIds, &groupId, sizeof(int32_t), NULL, 0) == 0) { if (taosHashPut(pTrans->arbGroupIds, &groupId, sizeof(int32_t), NULL, 0) != 0) {
mError("trans:%d, failed to put groupid into hash, groupId:%d", pTrans->id, groupId); mError("trans:%d, failed to put groupid into hash, groupId:%d", pTrans->id, groupId);
} }
} }