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 2024-12-09 19:07:27 +08:00
parent e68cff0427
commit 23415cc6d7
4 changed files with 14 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/common/tmsg.h
View File

@ -1835,7 +1835,7 @@ typedef struct {
int32_t tSerializeSConfigReq(void* buf, int32_t bufLen, SConfigReq* pReq); int32_t tSerializeSConfigReq(void* buf, int32_t bufLen, SConfigReq* pReq);
int32_t tDeserializeSConfigReq(void* buf, int32_t bufLen, SConfigReq* pReq); int32_t tDeserializeSConfigReq(void* buf, int32_t bufLen, SConfigReq* pReq);
void tFreeSStatusReq(SStatusReq* pReq); void tFreeSConfigReq(SConfigReq* pReq);
typedef struct { typedef struct {
int32_t dnodeId; int32_t dnodeId;

2
source/common/src/msg/tmsg.c
View File

@ -1644,6 +1644,8 @@ _exit:
return code; return code;
} }
void tFreeSConfigReq(SConfigReq *pReq) { taosArrayDestroy(pReq->array); }
int32_t tSerializeSConfigRsp(void *buf, int32_t bufLen, SConfigRsp *pRsp) { int32_t tSerializeSConfigRsp(void *buf, int32_t bufLen, SConfigRsp *pRsp) {
SEncoder encoder = {0}; SEncoder encoder = {0};
int32_t code = 0; int32_t code = 0;

6
source/dnode/mgmt/mgmt_dnode/src/dmHandle.c
View File

@ -287,6 +287,7 @@ static void dmProcessConfigRsp(SDnodeMgmt *pMgmt, SRpcMsg *pRsp) {
const STraceId *trace = &pRsp->info.traceId; const STraceId *trace = &pRsp->info.traceId;
int32_t code = 0; int32_t code = 0;
SConfigRsp configRsp = {0}; SConfigRsp configRsp = {0};
bool needStop = false;
if (pRsp->code != 0) { if (pRsp->code != 0) {
if (pRsp->code == TSDB_CODE_MND_DNODE_NOT_EXIST && !pMgmt->pData->dropped && pMgmt->pData->dnodeId > 0) { if (pRsp->code == TSDB_CODE_MND_DNODE_NOT_EXIST && !pMgmt->pData->dropped && pMgmt->pData->dnodeId > 0) {
@ -315,7 +316,7 @@ static void dmProcessConfigRsp(SDnodeMgmt *pMgmt, SRpcMsg *pRsp) {
} else { } else {
// log the difference configurations // log the difference configurations
printConfigNotMatch(configRsp.array); printConfigNotMatch(configRsp.array);
dmStop(); needStop = true;
goto _exit; goto _exit;
} }
} }
@ -347,6 +348,9 @@ static void dmProcessConfigRsp(SDnodeMgmt *pMgmt, SRpcMsg *pRsp) {
_exit: _exit:
tFreeSConfigRsp(&configRsp); tFreeSConfigRsp(&configRsp);
rpcFreeCont(pRsp->pCont); rpcFreeCont(pRsp->pCont);
if (needStop) {
dmStop();
}
} }
void dmSendConfigReq(SDnodeMgmt *pMgmt) { void dmSendConfigReq(SDnodeMgmt *pMgmt) {

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

@ -38,7 +38,7 @@ static int32_t mndProcessConfigDnodeReq(SRpcMsg *pReq);
static int32_t mndProcessConfigDnodeRsp(SRpcMsg *pRsp); static int32_t mndProcessConfigDnodeRsp(SRpcMsg *pRsp);
static int32_t mndProcessConfigReq(SRpcMsg *pReq); static int32_t mndProcessConfigReq(SRpcMsg *pReq);
static int32_t mndInitWriteCfg(SMnode *pMnode); static int32_t mndInitWriteCfg(SMnode *pMnode);
static int32_t mndInitReadCfg(SMnode *pMnode); static int32_t mndMaybeReBuildCfg(SMnode *pMnode);
static int32_t initConfigArrayFromSdb(SMnode *pMnode, SArray *array); static int32_t initConfigArrayFromSdb(SMnode *pMnode, SArray *array);
static void cfgArrayCleanUp(SArray *array); static void cfgArrayCleanUp(SArray *array);
@ -219,7 +219,7 @@ static int32_t mndCfgActionUpdate(SSdb *pSdb, SConfigObj *pOld, SConfigObj *pNew
static int32_t mndCfgActionDeploy(SMnode *pMnode) { return mndInitWriteCfg(pMnode); } static int32_t mndCfgActionDeploy(SMnode *pMnode) { return mndInitWriteCfg(pMnode); }
static int32_t mndCfgActionPrepare(SMnode *pMnode) { return mndInitReadCfg(pMnode); } static int32_t mndCfgActionPrepare(SMnode *pMnode) { return mndMaybeReBuildCfg(pMnode); }
static int32_t mndProcessConfigReq(SRpcMsg *pReq) { static int32_t mndProcessConfigReq(SRpcMsg *pReq) {
SMnode *pMnode = pReq->info.node; SMnode *pMnode = pReq->info.node;
@ -322,14 +322,9 @@ _OVER:
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
int32_t mndInitReadCfg(SMnode *pMnode) { int32_t mndMaybeReBuildCfg(SMnode *pMnode) {
int32_t code = 0; int32_t code = 0;
int32_t sz = -1; int32_t sz = -1;
STrans *pTrans = mndTransCreate(pMnode, TRN_POLICY_RETRY, TRN_CONFLICT_NOTHING, NULL, "init-read-config");
if (pTrans == NULL) {
mError("failed to init read cfg in create trans, since %s", terrstr());
goto _OVER;
}
SConfigObj *obj = sdbAcquire(pMnode->pSdb, SDB_CFG, "tsmmConfigVersion"); SConfigObj *obj = sdbAcquire(pMnode->pSdb, SDB_CFG, "tsmmConfigVersion");
if (obj == NULL) { if (obj == NULL) {
code = mndInitWriteCfg(pMnode); code = mndInitWriteCfg(pMnode);
@ -339,24 +334,8 @@ int32_t mndInitReadCfg(SMnode *pMnode) {
mInfo("failed to acquire mnd config version, try to rebuild it , since %s", terrstr()); mInfo("failed to acquire mnd config version, try to rebuild it , since %s", terrstr());
goto _OVER; goto _OVER;
} }
sz = taosArrayGetSize(taosGetGlobalCfg(tsCfg));
for (int i = 0; i < sz; ++i) {
SConfigItem *item = taosArrayGet(taosGetGlobalCfg(tsCfg), i);
SConfigObj *newObj = sdbAcquire(pMnode->pSdb, SDB_CFG, item->name);
if (newObj == NULL) {
mInfo("failed to acquire mnd config:%s, since %s", item->name, terrstr());
continue;
}
code = cfgUpdateItem(item, newObj);
if (code != 0) {
mError("failed to update mnd config:%s, since %s", item->name, terrstr());
}
sdbRelease(pMnode->pSdb, newObj);
}
_OVER: _OVER:
mndTransDrop(pTrans); return code;
return TSDB_CODE_SUCCESS;
} }
int32_t mndSetCreateConfigCommitLogs(STrans *pTrans, SConfigObj *item) { int32_t mndSetCreateConfigCommitLogs(STrans *pTrans, SConfigObj *item) {