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

fix/TD-31891-remove-void-sync1-fix-case

This commit is contained in:
dmchen 2024-09-20 08:38:30 +00:00
parent 1a031d7dcd
commit cc2d861e71
1 changed files with 8 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -991,11 +991,8 @@ static int32_t syncHbTimerStart(SSyncNode* pSyncNode, SSyncTimer* pSyncTimer) {
static int32_t syncHbTimerStop(SSyncNode* pSyncNode, SSyncTimer* pSyncTimer) { static int32_t syncHbTimerStop(SSyncNode* pSyncNode, SSyncTimer* pSyncTimer) {
int32_t ret = 0; int32_t ret = 0;
(void)atomic_add_fetch_64(&pSyncTimer->logicClock, 1); (void)atomic_add_fetch_64(&pSyncTimer->logicClock, 1);
if (taosTmrStop(pSyncTimer->pTimer) == false) { bool stop = taosTmrStop(pSyncTimer->pTimer);
sError("vgId:%d, failed to stop hb timer, return false", pSyncNode->vgId); sDebug("vgId:%d, stop hb timer stop:%d", pSyncNode->vgId, stop);
} else {
sError("vgId:%d, stop hb timer, return true", pSyncNode->vgId);
}
pSyncTimer->pTimer = NULL; pSyncTimer->pTimer = NULL;
syncHbTimerDataRemove(pSyncTimer->hbDataRid); syncHbTimerDataRemove(pSyncTimer->hbDataRid);
pSyncTimer->hbDataRid = -1; pSyncTimer->hbDataRid = -1;
@ -1638,8 +1635,8 @@ int32_t syncNodeStartPingTimer(SSyncNode* pSyncNode) {
int32_t syncNodeStopPingTimer(SSyncNode* pSyncNode) { int32_t syncNodeStopPingTimer(SSyncNode* pSyncNode) {
int32_t code = 0; int32_t code = 0;
(void)atomic_add_fetch_64(&pSyncNode->pingTimerLogicClockUser, 1); (void)atomic_add_fetch_64(&pSyncNode->pingTimerLogicClockUser, 1);
// TODO check return value bool stop = taosTmrStop(pSyncNode->pPingTimer);
TAOS_CHECK_RETURN(taosTmrStop(pSyncNode->pPingTimer)); sDebug("vgId:%d, stop ping timer, stop:%d", pSyncNode->vgId, stop);
pSyncNode->pPingTimer = NULL; pSyncNode->pPingTimer = NULL;
return code; return code;
} }
@ -1666,8 +1663,8 @@ int32_t syncNodeStartElectTimer(SSyncNode* pSyncNode, int32_t ms) {
int32_t syncNodeStopElectTimer(SSyncNode* pSyncNode) { int32_t syncNodeStopElectTimer(SSyncNode* pSyncNode) {
int32_t code = 0; int32_t code = 0;
(void)atomic_add_fetch_64(&pSyncNode->electTimerLogicClock, 1); (void)atomic_add_fetch_64(&pSyncNode->electTimerLogicClock, 1);
// TODO check return value bool stop = taosTmrStop(pSyncNode->pElectTimer);
TAOS_CHECK_RETURN(taosTmrStop(pSyncNode->pElectTimer)); sDebug("vgId:%d, stop elect timer, stop:%d", pSyncNode->vgId, stop);
pSyncNode->pElectTimer = NULL; pSyncNode->pElectTimer = NULL;
return code; return code;
@ -1738,9 +1735,9 @@ int32_t syncNodeStopHeartbeatTimer(SSyncNode* pSyncNode) {
int32_t code = 0; int32_t code = 0;
#if 0 #if 0
//TODO check return value
TAOS_CHECK_RETURN(atomic_add_fetch_64(&pSyncNode->heartbeatTimerLogicClockUser, 1)); TAOS_CHECK_RETURN(atomic_add_fetch_64(&pSyncNode->heartbeatTimerLogicClockUser, 1));
TAOS_CHECK_RETURN(taosTmrStop(pSyncNode->pHeartbeatTimer)); bool stop = taosTmrStop(pSyncNode->pHeartbeatTimer);
sDebug("vgId:%d, stop heartbeat timer, stop:%d", pSyncNode->vgId, stop);
pSyncNode->pHeartbeatTimer = NULL; pSyncNode->pHeartbeatTimer = NULL;
#endif #endif