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

fix(analytics): check return value.

This commit is contained in:
Haojun Liao 2024-11-21 16:40:06 +08:00
parent ac3081a4a4
commit e103d3963b
3 changed files with 36 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
source/dnode/mnode/impl/src/mndAnode.c
View File

@ -491,23 +491,24 @@ static int32_t mndSetDropAnodeRedoLogs(STrans *pTrans, SAnodeObj *pObj) {
int32_t code = 0; int32_t code = 0;
SSdbRaw *pRedoRaw = mndAnodeActionEncode(pObj); SSdbRaw *pRedoRaw = mndAnodeActionEncode(pObj);
if (pRedoRaw == NULL) { if (pRedoRaw == NULL) {
code = TSDB_CODE_MND_RETURN_VALUE_NULL; code = terrno;
if (terrno != 0) code = terrno; return code;
TAOS_RETURN(code);
} }
TAOS_CHECK_RETURN(mndTransAppendRedolog(pTrans, pRedoRaw)); TAOS_CHECK_RETURN(mndTransAppendRedolog(pTrans, pRedoRaw));
TAOS_CHECK_RETURN(sdbSetRawStatus(pRedoRaw, SDB_STATUS_DROPPING)); TAOS_CHECK_RETURN(sdbSetRawStatus(pRedoRaw, SDB_STATUS_DROPPING));
TAOS_RETURN(code);
return code;
} }
static int32_t mndSetDropAnodeCommitLogs(STrans *pTrans, SAnodeObj *pObj) { static int32_t mndSetDropAnodeCommitLogs(STrans *pTrans, SAnodeObj *pObj) {
int32_t code = 0; int32_t code = 0;
SSdbRaw *pCommitRaw = mndAnodeActionEncode(pObj); SSdbRaw *pCommitRaw = mndAnodeActionEncode(pObj);
if (pCommitRaw == NULL) { if (pCommitRaw == NULL) {
code = TSDB_CODE_MND_RETURN_VALUE_NULL; code = terrno;
if (terrno != 0) code = terrno; return code;
TAOS_RETURN(code);
} }
TAOS_CHECK_RETURN(mndTransAppendCommitlog(pTrans, pCommitRaw)); TAOS_CHECK_RETURN(mndTransAppendCommitlog(pTrans, pCommitRaw));
TAOS_CHECK_RETURN(sdbSetRawStatus(pCommitRaw, SDB_STATUS_DROPPED)); TAOS_CHECK_RETURN(sdbSetRawStatus(pCommitRaw, SDB_STATUS_DROPPED));
TAOS_RETURN(code); TAOS_RETURN(code);
@ -521,25 +522,25 @@ static int32_t mndSetDropAnodeInfoToTrans(SMnode *pMnode, STrans *pTrans, SAnode
} }
static int32_t mndDropAnode(SMnode *pMnode, SRpcMsg *pReq, SAnodeObj *pObj) { static int32_t mndDropAnode(SMnode *pMnode, SRpcMsg *pReq, SAnodeObj *pObj) {
int32_t code = -1; int32_t code = 0;
int32_t lino = 0;
STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_CONFLICT_NOTHING, pReq, "drop-anode"); STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_CONFLICT_NOTHING, pReq, "drop-anode");
if (pTrans == NULL) { TSDB_CHECK_NULL(pTrans, code, lino, _OVER, terrno);
code = TSDB_CODE_MND_RETURN_VALUE_NULL;
if (terrno != 0) code = terrno;
goto _OVER;
}
mndTransSetSerial(pTrans); mndTransSetSerial(pTrans);
mInfo("trans:%d, to drop anode:%d", pTrans->id, pObj->id);
mInfo("trans:%d, used to drop anode:%d", pTrans->id, pObj->id); code = mndSetDropAnodeInfoToTrans(pMnode, pTrans, pObj, false);
TAOS_CHECK_GOTO(mndSetDropAnodeInfoToTrans(pMnode, pTrans, pObj, false), NULL, _OVER); mndReleaseAnode(pMnode, pObj);
TAOS_CHECK_GOTO(mndTransPrepare(pMnode, pTrans), NULL, _OVER);
code = 0; TSDB_CHECK_CODE(code, lino, _OVER);
code = mndTransPrepare(pMnode, pTrans);
_OVER: _OVER:
mndTransDrop(pTrans); mndTransDrop(pTrans);
TAOS_RETURN(code); return code;
} }
static int32_t mndProcessDropAnodeReq(SRpcMsg *pReq) { static int32_t mndProcessDropAnodeReq(SRpcMsg *pReq) {
@ -560,20 +561,20 @@ static int32_t mndProcessDropAnodeReq(SRpcMsg *pReq) {
pObj = mndAcquireAnode(pMnode, dropReq.anodeId); pObj = mndAcquireAnode(pMnode, dropReq.anodeId);
if (pObj == NULL) { if (pObj == NULL) {
code = TSDB_CODE_MND_RETURN_VALUE_NULL; code = terrno;
if (terrno != 0) code = terrno;
goto _OVER; goto _OVER;
} }
code = mndDropAnode(pMnode, pReq, pObj); code = mndDropAnode(pMnode, pReq, pObj);
if (code == 0) code = TSDB_CODE_ACTION_IN_PROGRESS; if (code == 0) {
code = TSDB_CODE_ACTION_IN_PROGRESS;
}
_OVER: _OVER:
if (code != 0 && code != TSDB_CODE_ACTION_IN_PROGRESS) { if (code != 0 && code != TSDB_CODE_ACTION_IN_PROGRESS) {
mError("anode:%d, failed to drop since %s", dropReq.anodeId, tstrerror(code)); mError("anode:%d, failed to drop since %s", dropReq.anodeId, tstrerror(code));
} }
mndReleaseAnode(pMnode, pObj);
tFreeSMDropAnodeReq(&dropReq); tFreeSMDropAnodeReq(&dropReq);
TAOS_RETURN(code); TAOS_RETURN(code);
} }

9
source/libs/executor/src/anomalywindowoperator.c
View File

@ -301,8 +301,13 @@ static int32_t anomalyParseJson(SJson* pJson, SArray* pWindows, const char* pId)
if (rows < 0) { if (rows < 0) {
char pMsg[1024] = {0}; char pMsg[1024] = {0};
tjsonGetStringValue(pJson, "msg", pMsg); code = tjsonGetStringValue(pJson, "msg", pMsg);
qError("%s failed to exec forecast, msg:%s", pId, pMsg); if (code) {
qError("%s failed to get error msg from rsp, unknown error", pId);
} else {
qError("%s failed to exec forecast, msg:%s", pId, pMsg);
}
return TSDB_CODE_ANA_WN_DATA; return TSDB_CODE_ANA_WN_DATA;
} else if (rows == 0) { } else if (rows == 0) {
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;

8
source/libs/executor/src/forecastoperator.c
View File

@ -210,8 +210,12 @@ static int32_t forecastAnalysis(SForecastSupp* pSupp, SSDataBlock* pBlock, const
tjsonGetInt32ValueFromDouble(pJson, "rows", rows, code); tjsonGetInt32ValueFromDouble(pJson, "rows", rows, code);
if (rows < 0 && code == 0) { if (rows < 0 && code == 0) {
char pMsg[1024] = {0}; char pMsg[1024] = {0};
tjsonGetStringValue(pJson, "msg", pMsg); code = tjsonGetStringValue(pJson, "msg", pMsg);
qError("%s failed to exec forecast, msg:%s", pId, pMsg); if (code != 0) {
qError("%s failed to get msg from rsp, unknown error", pId);
} else {
qError("%s failed to exec forecast, msg:%s", pId, pMsg);
}
tjsonDelete(pJson); tjsonDelete(pJson);
return TSDB_CODE_ANA_WN_DATA; return TSDB_CODE_ANA_WN_DATA;