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

Fix some review errors.

This commit is contained in:
xiao-77 2025-02-08 18:51:39 +08:00
parent 4011d01148
commit adfab1f2b6
1 changed files with 9 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
source/dnode/mnode/impl/src/mndConfig.c
View File

@ -251,7 +251,12 @@ static int32_t mndProcessConfigReq(SRpcMsg *pReq) {
configRsp.cver = vObj->i32; configRsp.cver = vObj->i32;
if (configRsp.forceReadConfig) { if (configRsp.forceReadConfig) {
// compare config array from configReq with current config array // compare config array from configReq with current config array
if (compareSConfigItemArrays(pMnode, configReq.array, array)) { code = compareSConfigItemArrays(pMnode, configReq.array, array);
if (code != TSDB_CODE_SUCCESS) {
mError("failed to compare config array, since %s", tstrerror(code));
goto _OVER;
}
if (taosArrayGetSize(array) > 0) {
configRsp.array = array; configRsp.array = array;
} else { } else {
configRsp.isConifgVerified = 1; configRsp.isConifgVerified = 1;
@ -294,7 +299,7 @@ _OVER:
} }
sdbRelease(pMnode->pSdb, vObj); sdbRelease(pMnode->pSdb, vObj);
cfgArrayCleanUp(array); cfgArrayCleanUp(array);
return TSDB_CODE_SUCCESS; return code;
} }
int32_t mndInitWriteCfg(SMnode *pMnode) { int32_t mndInitWriteCfg(SMnode *pMnode) {
@ -969,7 +974,7 @@ int32_t compareSConfigItem(const SConfigObj *item1, SConfigItem *item2, bool *co
return TSDB_CODE_INVALID_CFG; return TSDB_CODE_INVALID_CFG;
} }
*compare = true; *compare = true;
return TSDB_CODE_SUCCESS return TSDB_CODE_SUCCESS;
} }
int32_t compareSConfigItemArrays(SMnode *pMnode, const SArray *dArray, SArray *diffArray) { int32_t compareSConfigItemArrays(SMnode *pMnode, const SArray *dArray, SArray *diffArray) {
@ -985,6 +990,7 @@ int32_t compareSConfigItemArrays(SMnode *pMnode, const SArray *dArray, SArray *d
mError("failed to acquire config:%s from sdb, since %s", dItem->name, tstrerror(code)); mError("failed to acquire config:%s from sdb, since %s", dItem->name, tstrerror(code));
return code; return code;
} }
code = compareSConfigItem(mObj, dItem, &compare); code = compareSConfigItem(mObj, dItem, &compare);
if (code != TSDB_CODE_SUCCESS) { if (code != TSDB_CODE_SUCCESS) {
sdbRelease(pMnode->pSdb, mObj); sdbRelease(pMnode->pSdb, mObj);
@ -992,7 +998,6 @@ int32_t compareSConfigItemArrays(SMnode *pMnode, const SArray *dArray, SArray *d
} }
if (!compare) { if (!compare) {
code = TSDB_CODE_FAILED;
if (taosArrayPush(diffArray, dItem) == NULL) { if (taosArrayPush(diffArray, dItem) == NULL) {
sdbRelease(pMnode->pSdb, mObj); sdbRelease(pMnode->pSdb, mObj);
return terrno; return terrno;