From f4c8b6d081a4fcbfbb6a0d55723037fa4af19543 Mon Sep 17 00:00:00 2001 From: dmchen Date: Mon, 29 Jul 2024 12:06:41 +0000 Subject: [PATCH] fix case --- source/dnode/mnode/impl/src/mndMain.c | 93 +++++++++------------------ 1 file changed, 32 insertions(+), 61 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndMain.c b/source/dnode/mnode/impl/src/mndMain.c index 9b6c2ab201..4f195227a2 100644 --- a/source/dnode/mnode/impl/src/mndMain.c +++ b/source/dnode/mnode/impl/src/mndMain.c @@ -48,7 +48,7 @@ static inline int32_t mndAcquireRpc(SMnode *pMnode) { int32_t code = 0; - TAOS_CHECK_RETURN(taosThreadRwlockRdlock(&pMnode->lock)); + (void)taosThreadRwlockRdlock(&pMnode->lock); if (pMnode->stopped) { code = TSDB_CODE_APP_IS_STOPPING; } else if (!mndIsLeader(pMnode)) { @@ -61,7 +61,7 @@ static inline int32_t mndAcquireRpc(SMnode *pMnode) { mTrace("mnode rpc is acquired, ref:%d", ref); #endif } - TAOS_CHECK_RETURN(taosThreadRwlockUnlock(&pMnode->lock)); + (void)taosThreadRwlockUnlock(&pMnode->lock); TAOS_RETURN(code); } @@ -91,62 +91,52 @@ static void *mndBuildTimerMsg(int32_t *pContLen) { } static void mndPullupTrans(SMnode *pMnode) { - int32_t code = 0; mTrace("pullup trans msg"); int32_t contLen = 0; void *pReq = mndBuildTimerMsg(&contLen); if (pReq != NULL) { SRpcMsg rpcMsg = {.msgType = TDMT_MND_TRANS_TIMER, .pCont = pReq, .contLen = contLen}; - if ((code = tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg)) != 0) { - mError("failed to put to queue since %s", tstrerror(code)); - } + //TODO check return value + (void)tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg); } } static void mndPullupCompacts(SMnode *pMnode) { - int32_t code = 0; mTrace("pullup compact timer msg"); int32_t contLen = 0; void *pReq = mndBuildTimerMsg(&contLen); if (pReq != NULL) { SRpcMsg rpcMsg = {.msgType = TDMT_MND_COMPACT_TIMER, .pCont = pReq, .contLen = contLen}; - if ((code = tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg)) != 0) { - mError("failed to put to queue since %s", tstrerror(code)); - } + //TODO check return value + (void)tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg); } } static void mndPullupTtl(SMnode *pMnode) { - int32_t code = 0; mTrace("pullup ttl"); int32_t contLen = 0; void *pReq = mndBuildTimerMsg(&contLen); SRpcMsg rpcMsg = {.msgType = TDMT_MND_TTL_TIMER, .pCont = pReq, .contLen = contLen}; - if ((code = tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg)) != 0) { - mError("failed to put to queue since %s", tstrerror(code)); - } + //TODO check return value + (void)tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg); } static void mndPullupTrimDb(SMnode *pMnode) { - int32_t code = 0; mTrace("pullup s3migrate"); int32_t contLen = 0; void *pReq = mndBuildTimerMsg(&contLen); SRpcMsg rpcMsg = {.msgType = TDMT_MND_S3MIGRATE_DB_TIMER, .pCont = pReq, .contLen = contLen}; - if ((code = tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg)) != 0) { - mError("failed to put to queue since %s", tstrerror(code)); - } + // TODO check return value + (void)tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg); } static void mndPullupS3MigrateDb(SMnode *pMnode) { - int32_t code = 0; mTrace("pullup trim"); int32_t contLen = 0; void *pReq = mndBuildTimerMsg(&contLen); SRpcMsg rpcMsg = {.msgType = TDMT_MND_TRIM_DB_TIMER, .pCont = pReq, .contLen = contLen}; - if ((code = tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg)) != 0) { - mError("failed to put to queue since %s", tstrerror(code)); - } + // TODO check return value + (void)tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg); } static int32_t mndPullupArbHeartbeat(SMnode *pMnode) { @@ -166,91 +156,76 @@ static int32_t mndPullupArbCheckSync(SMnode *pMnode) { } static void mndCalMqRebalance(SMnode *pMnode) { - int32_t code = 0; int32_t contLen = 0; void *pReq = mndBuildTimerMsg(&contLen); if (pReq != NULL) { SRpcMsg rpcMsg = {.msgType = TDMT_MND_TMQ_TIMER, .pCont = pReq, .contLen = contLen}; - if ((code = tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg)) != 0) { - mError("failed to put to queue since %s", tstrerror(code)); - } + (void)tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg); } } static void mndStreamCheckpointTimer(SMnode *pMnode) { - int32_t code = 0; SMStreamDoCheckpointMsg *pMsg = rpcMallocCont(sizeof(SMStreamDoCheckpointMsg)); if (pMsg != NULL) { int32_t size = sizeof(SMStreamDoCheckpointMsg); SRpcMsg rpcMsg = {.msgType = TDMT_MND_STREAM_BEGIN_CHECKPOINT, .pCont = pMsg, .contLen = size}; - if ((code = tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg)) != 0) { - mError("failed to put to queue since %s", tstrerror(code)); - } + // TODO check return value + (void)tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg); } } static void mndStreamCheckNode(SMnode *pMnode) { - int32_t code = 0; int32_t contLen = 0; void *pReq = mndBuildTimerMsg(&contLen); if (pReq != NULL) { SRpcMsg rpcMsg = {.msgType = TDMT_MND_NODECHECK_TIMER, .pCont = pReq, .contLen = contLen}; - if ((code = tmsgPutToQueue(&pMnode->msgCb, READ_QUEUE, &rpcMsg)) != 0) { - mError("failed to put to queue since %s", tstrerror(code)); - } + // TODO check return value + (void)tmsgPutToQueue(&pMnode->msgCb, READ_QUEUE, &rpcMsg); } } static void mndStreamConsensusChkpt(SMnode *pMnode) { - int32_t code = 0; int32_t contLen = 0; void *pReq = mndBuildTimerMsg(&contLen); if (pReq != NULL) { SRpcMsg rpcMsg = {.msgType = TDMT_MND_STREAM_CONSEN_TIMER, .pCont = pReq, .contLen = contLen}; - if ((code = tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg)) != 0) { - mError("failed to put to queue since %s", tstrerror(code)); - } + // TODO check return value + (void)tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg); } } static void mndPullupTelem(SMnode *pMnode) { - int32_t code = 0; mTrace("pullup telem msg"); int32_t contLen = 0; void *pReq = mndBuildTimerMsg(&contLen); if (pReq != NULL) { SRpcMsg rpcMsg = {.msgType = TDMT_MND_TELEM_TIMER, .pCont = pReq, .contLen = contLen}; - if ((code = tmsgPutToQueue(&pMnode->msgCb, READ_QUEUE, &rpcMsg)) != 0) { - mError("failed to put to queue since %s", tstrerror(code)); - } + // TODO check return value + (void)tmsgPutToQueue(&pMnode->msgCb, READ_QUEUE, &rpcMsg); } } static void mndPullupGrant(SMnode *pMnode) { - int32_t code = 0; mTrace("pullup grant msg"); int32_t contLen = 0; void *pReq = mndBuildTimerMsg(&contLen); if (pReq != NULL) { SRpcMsg rpcMsg = { .msgType = TDMT_MND_GRANT_HB_TIMER, .pCont = pReq, .contLen = contLen, .info.ahandle = (void *)0x9527}; - if ((code = tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg)) != 0) { - mError("failed to put to queue since %s", tstrerror(code)); - } + // TODO check return value + (void)tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg); } } static void mndIncreaseUpTime(SMnode *pMnode) { - int32_t code = 0; mTrace("increate uptime"); int32_t contLen = 0; void *pReq = mndBuildTimerMsg(&contLen); if (pReq != NULL) { SRpcMsg rpcMsg = { .msgType = TDMT_MND_UPTIME_TIMER, .pCont = pReq, .contLen = contLen, .info.ahandle = (void *)0x9528}; - if ((code = tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg)) != 0) { - mError("failed to put to queue since %s", tstrerror(code)); - } + // TODO check return value + (void)tmsgPutToQueue(&pMnode->msgCb, WRITE_QUEUE, &rpcMsg); } } @@ -465,14 +440,14 @@ static void *mndThreadFp(void *param) { static int32_t mndInitTimer(SMnode *pMnode) { int32_t code = 0; TdThreadAttr thAttr; - TAOS_CHECK_RETURN(taosThreadAttrInit(&thAttr)); - TAOS_CHECK_RETURN(taosThreadAttrSetDetachState(&thAttr, PTHREAD_CREATE_JOINABLE)); + (void)taosThreadAttrInit(&thAttr); + (void)taosThreadAttrSetDetachState(&thAttr, PTHREAD_CREATE_JOINABLE); if ((code = taosThreadCreate(&pMnode->thread, &thAttr, mndThreadFp, pMnode)) != 0) { mError("failed to create timer thread since %s", strerror(errno)); TAOS_RETURN(code); } - TAOS_CHECK_RETURN(taosThreadAttrDestroy(&thAttr)); + (void)taosThreadAttrDestroy(&thAttr); tmsgReportStartup("mnode-timer", "initialized"); TAOS_RETURN(code); } @@ -739,15 +714,11 @@ SMnode *mndOpen(const char *path, const SMnodeOpt *pOption) { } void mndPreClose(SMnode *pMnode) { - int32_t code = 0; if (pMnode != NULL) { - if ((code = syncLeaderTransfer(pMnode->syncMgmt.sync)) != 0) { - mError("failed to pre close since %s", tstrerror(code)); - } + // TODO check return value + syncLeaderTransfer(pMnode->syncMgmt.sync); syncPreStop(pMnode->syncMgmt.sync); - if ((code = sdbWriteFile(pMnode->pSdb, 0)) != 0) { - mError("failed to pre close since %s", tstrerror(code)); - } + sdbWriteFile(pMnode->pSdb, 0); } } @@ -826,7 +797,7 @@ static int32_t mndCheckMnodeState(SRpcMsg *pMsg) { } SMnode *pMnode = pMsg->info.node; - TAOS_CHECK_RETURN(taosThreadRwlockRdlock(&pMnode->lock)); + (void)taosThreadRwlockRdlock(&pMnode->lock); if (pMnode->stopped) { (void)taosThreadRwlockUnlock(&pMnode->lock); code = TSDB_CODE_APP_IS_STOPPING;