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

fix/TD-30989

This commit is contained in:
dmchen 2024-07-30 02:38:12 +00:00
parent 235712b79e
commit a43b866fab
4 changed files with 9 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
source/dnode/mnode/impl/src/mndMain.c
View File

@ -716,9 +716,9 @@ SMnode *mndOpen(const char *path, const SMnodeOpt *pOption) {
void mndPreClose(SMnode *pMnode) { void mndPreClose(SMnode *pMnode) {
if (pMnode != NULL) { if (pMnode != NULL) {
// TODO check return value // TODO check return value
syncLeaderTransfer(pMnode->syncMgmt.sync); (void)syncLeaderTransfer(pMnode->syncMgmt.sync);
syncPreStop(pMnode->syncMgmt.sync); syncPreStop(pMnode->syncMgmt.sync);
sdbWriteFile(pMnode->pSdb, 0); (void)sdbWriteFile(pMnode->pSdb, 0);
} }
} }
@ -1106,12 +1106,12 @@ int64_t mndGetRoleTimeMs(SMnode *pMnode) {
void mndSetRestored(SMnode *pMnode, bool restored) { void mndSetRestored(SMnode *pMnode, bool restored) {
if (restored) { if (restored) {
taosThreadRwlockWrlock(&pMnode->lock); (void)taosThreadRwlockWrlock(&pMnode->lock);
pMnode->restored = true; pMnode->restored = true;
(void)taosThreadRwlockUnlock(&pMnode->lock); (void)taosThreadRwlockUnlock(&pMnode->lock);
mInfo("mnode set restored:%d", restored); mInfo("mnode set restored:%d", restored);
} else { } else {
taosThreadRwlockWrlock(&pMnode->lock); (void)taosThreadRwlockWrlock(&pMnode->lock);
pMnode->restored = false; pMnode->restored = false;
(void)taosThreadRwlockUnlock(&pMnode->lock); (void)taosThreadRwlockUnlock(&pMnode->lock);
mInfo("mnode set restored:%d", restored); mInfo("mnode set restored:%d", restored);
@ -1125,7 +1125,7 @@ void mndSetRestored(SMnode *pMnode, bool restored) {
bool mndGetRestored(SMnode *pMnode) { return pMnode->restored; } bool mndGetRestored(SMnode *pMnode) { return pMnode->restored; }
void mndSetStop(SMnode *pMnode) { void mndSetStop(SMnode *pMnode) {
taosThreadRwlockWrlock(&pMnode->lock); (void)taosThreadRwlockWrlock(&pMnode->lock);
pMnode->stopped = true; pMnode->stopped = true;
(void)taosThreadRwlockUnlock(&pMnode->lock); (void)taosThreadRwlockUnlock(&pMnode->lock);
mInfo("mnode set stopped"); mInfo("mnode set stopped");

4
source/dnode/mnode/impl/src/mndProfile.c
View File

@ -575,7 +575,7 @@ static int32_t mndProcessQueryHeartBeat(SMnode *pMnode, SRpcMsg *pMsg, SClientHb
if (needCheck) { if (needCheck) {
SKv kv1 = {.key = HEARTBEAT_KEY_DYN_VIEW, .valueLen = sizeof(*pDynViewVer), .value = pRspVer}; SKv kv1 = {.key = HEARTBEAT_KEY_DYN_VIEW, .valueLen = sizeof(*pDynViewVer), .value = pRspVer};
taosArrayPush(hbRsp.info, &kv1); TAOS_CHECK_RETURN(taosArrayPush(hbRsp.info, &kv1));
mTrace("need to check view ver, lastest bootTs:%" PRId64 ", ver:%" PRIu64, pRspVer->svrBootTs, mTrace("need to check view ver, lastest bootTs:%" PRId64 ", ver:%" PRIu64, pRspVer->svrBootTs,
pRspVer->dynViewVer); pRspVer->dynViewVer);
} }
@ -703,7 +703,7 @@ static int32_t mndProcessHeartBeatReq(SRpcMsg *pReq) {
} else if (pHbReq->connKey.connType == CONN_TYPE__TMQ) { } else if (pHbReq->connKey.connType == CONN_TYPE__TMQ) {
SClientHbRsp *pRsp = mndMqHbBuildRsp(pMnode, pHbReq); SClientHbRsp *pRsp = mndMqHbBuildRsp(pMnode, pHbReq);
if (pRsp != NULL) { if (pRsp != NULL) {
taosArrayPush(batchRsp.rsps, pRsp); (void)taosArrayPush(batchRsp.rsps, pRsp);
taosMemoryFree(pRsp); taosMemoryFree(pRsp);
} }
} }

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

@ -2629,7 +2629,7 @@ static int32_t mndProcessAlterStbReq(SRpcMsg *pReq) {
SName name = {0}; SName name = {0};
// TODO check return value // TODO check return value
tNameFromString(&name, alterReq.name, T_NAME_ACCT | T_NAME_DB | T_NAME_TABLE); (void)tNameFromString(&name, alterReq.name, T_NAME_ACCT | T_NAME_DB | T_NAME_TABLE);
auditRecord(pReq, pMnode->clusterId, "alterStb", name.dbname, name.tname, alterReq.sql, alterReq.sqlLen); auditRecord(pReq, pMnode->clusterId, "alterStb", name.dbname, name.tname, alterReq.sql, alterReq.sqlLen);

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

@ -181,7 +181,7 @@ int32_t syncReconfig(int64_t rid, SSyncCfg* pNewCfg) {
TAOS_RETURN(code); TAOS_RETURN(code);
} }
syncNodeUpdateNewConfigIndex(pSyncNode, pNewCfg); TAOS_CHECK_RETURN(syncNodeUpdateNewConfigIndex(pSyncNode, pNewCfg));
syncNodeDoConfigChange(pSyncNode, pNewCfg, pNewCfg->lastIndex); syncNodeDoConfigChange(pSyncNode, pNewCfg, pNewCfg->lastIndex);
if (pSyncNode->state == TAOS_SYNC_STATE_LEADER || pSyncNode->state == TAOS_SYNC_STATE_ASSIGNED_LEADER) { if (pSyncNode->state == TAOS_SYNC_STATE_LEADER || pSyncNode->state == TAOS_SYNC_STATE_ASSIGNED_LEADER) {