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

fix/remove-wrong-error-log

This commit is contained in:
dmchen 2024-12-03 11:37:10 +08:00
parent fb8a10e717
commit f852049156
3 changed files with 7 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
source/libs/sync/src/syncMain.c
View File

@ -1697,9 +1697,8 @@ void syncNodeResetElectTimer(SSyncNode* pSyncNode) {
electMS = syncUtilElectRandomMS(pSyncNode->electBaseLine, 2 * pSyncNode->electBaseLine);
}
// TODO check return value
if ((code = syncNodeRestartElectTimer(pSyncNode, electMS)) != 0) {
sError("vgId:%d, failed to restart elect timer since %s", pSyncNode->vgId, tstrerror(code));
sWarn("vgId:%d, failed to restart elect timer since %s", pSyncNode->vgId, tstrerror(code));
return;
};

4
source/libs/sync/src/syncPipeline.c
View File

@ -1152,11 +1152,11 @@ int32_t syncLogReplProcessReply(SSyncLogReplMgr* pMgr, SSyncNode* pNode, SyncApp
int32_t code = 0;
if (pMgr->restored) {
if ((code = syncLogReplContinue(pMgr, pNode, pMsg)) != 0) {
sError("vgId:%d, failed to continue sync log repl since %s", pNode->vgId, tstrerror(code));
sWarn("vgId:%d, failed to continue sync log repl since %s", pNode->vgId, tstrerror(code));
}
} else {
if ((code = syncLogReplRecover(pMgr, pNode, pMsg)) != 0) {
sError("vgId:%d, failed to recover sync log repl since %s", pNode->vgId, tstrerror(code));
sWarn("vgId:%d, failed to recover sync log repl since %s", pNode->vgId, tstrerror(code));
}
}
(void)taosThreadMutexUnlock(&pBuf->mutex);

6
source/libs/sync/src/syncReplication.c
View File

@ -75,8 +75,10 @@ int32_t syncNodeReplicateWithoutLock(SSyncNode* pNode) {
continue;
}
SSyncLogReplMgr* pMgr = pNode->logReplMgrs[i];
if (syncLogReplStart(pMgr, pNode) != 0) {
sError("vgId:%d, failed to start log replication to dnode:%d", pNode->vgId, DID(&(pNode->replicasId[i])));
int32_t ret = 0;
if ((ret = syncLogReplStart(pMgr, pNode)) != 0) {
sWarn("vgId:%d, failed to start log replication to dnode:%d since %s", pNode->vgId, DID(&(pNode->replicasId[i])),
tstrerror(ret));
}
}