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

chore: more code

This commit is contained in:
kailixu 2023-10-01 21:55:17 +08:00
parent 5067eb8cc5
commit a19efd266e
2 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
source/dnode/mnode/impl/src/mndDnode.c
View File

@ -765,6 +765,7 @@ static int32_t mndConfigDnode(SMnode *pMnode, SRpcMsg *pReq, SMCfgDnodeReq *pCfg
SDnodeObj *pDnode = NULL; SDnodeObj *pDnode = NULL;
SArray *failRecord = NULL; SArray *failRecord = NULL;
bool cfgAll = pCfgReq->dnodeId == -1; bool cfgAll = pCfgReq->dnodeId == -1;
int32_t cfgAllErr = 0;
int32_t iter = 0; int32_t iter = 0;
if (cfgAll && !(failRecord = taosArrayInit(1, sizeof(int32_t)))) { if (cfgAll && !(failRecord = taosArrayInit(1, sizeof(int32_t)))) {
@ -790,11 +791,13 @@ static int32_t mndConfigDnode(SMnode *pMnode, SRpcMsg *pReq, SMCfgDnodeReq *pCfg
#else #else
if (grantAlterActiveCode(pDnode->active, pCfgReq->value, tmpDnode.active, 0) != 0) { if (grantAlterActiveCode(pDnode->active, pCfgReq->value, tmpDnode.active, 0) != 0) {
if (TSDB_CODE_DUP_KEY != terrno) { if (TSDB_CODE_DUP_KEY != terrno) {
mError("dnode:%d, config dnode, cfg:%d, app:%p config:%s value:%s failed since %s", pDnode->id, mError("dnode:%d, config dnode:%d, app:%p config:%s value:%s failed since %s", pDnode->id,
pCfgReq->dnodeId, pReq->info.ahandle, pCfgReq->config, pCfgReq->value, terrstr()); pCfgReq->dnodeId, pReq->info.ahandle, pCfgReq->config, pCfgReq->value, terrstr());
if (failRecord) taosArrayPush(failRecord, &pDnode->id); if (failRecord) taosArrayPush(failRecord, &pDnode->id);
if (!cfgAll) goto _OVER; if (cfgAll && (0 == cfgAllErr)) cfgAllErr = terrno;
} }
if (cfgAll) continue;
goto _OVER;
} }
#endif #endif
} else if (action == DND_CONN_ACTIVE_CODE) { } else if (action == DND_CONN_ACTIVE_CODE) {
@ -803,11 +806,13 @@ static int32_t mndConfigDnode(SMnode *pMnode, SRpcMsg *pReq, SMCfgDnodeReq *pCfg
#else #else
if (grantAlterActiveCode(pDnode->connActive, pCfgReq->value, tmpDnode.connActive, 1) != 0) { if (grantAlterActiveCode(pDnode->connActive, pCfgReq->value, tmpDnode.connActive, 1) != 0) {
if (TSDB_CODE_DUP_KEY != terrno) { if (TSDB_CODE_DUP_KEY != terrno) {
mError("dnode:%d, config dnode, cfg:%d, app:%p config:%s value:%s failed since %s", pDnode->id, mError("dnode:%d, config dnode:%d, app:%p config:%s value:%s failed since %s", pDnode->id,
pCfgReq->dnodeId, pReq->info.ahandle, pCfgReq->config, pCfgReq->value, terrstr()); pCfgReq->dnodeId, pReq->info.ahandle, pCfgReq->config, pCfgReq->value, terrstr());
if (failRecord) taosArrayPush(failRecord, &pDnode->id); if (failRecord) taosArrayPush(failRecord, &pDnode->id);
if (!cfgAll) goto _OVER; if (cfgAll && (0 == cfgAllErr)) cfgAllErr = terrno;
} }
if (cfgAll) continue;
goto _OVER;
} }
#endif #endif
} else { } else {
@ -826,7 +831,7 @@ static int32_t mndConfigDnode(SMnode *pMnode, SRpcMsg *pReq, SMCfgDnodeReq *pCfg
(void)sdbSetRawStatus(pRaw, SDB_STATUS_READY); (void)sdbSetRawStatus(pRaw, SDB_STATUS_READY);
pRaw = NULL; pRaw = NULL;
mInfo("dnode:%d, config dnode, cfg:%d, app:%p config:%s value:%s", pDnode->id, pCfgReq->dnodeId, pReq->info.ahandle, mInfo("dnode:%d, config dnode:%d, app:%p config:%s value:%s", pDnode->id, pCfgReq->dnodeId, pReq->info.ahandle,
pCfgReq->config, pCfgReq->value); pCfgReq->config, pCfgReq->value);
if (cfgAll) { if (cfgAll) {
@ -844,6 +849,7 @@ static int32_t mndConfigDnode(SMnode *pMnode, SRpcMsg *pReq, SMCfgDnodeReq *pCfg
_OVER: _OVER:
if (cfgAll) { if (cfgAll) {
sdbRelease(pSdb, pDnode); sdbRelease(pSdb, pDnode);
if (cfgAllErr != 0) terrno = cfgAllErr;
int32_t nFail = taosArrayGetSize(failRecord); int32_t nFail = taosArrayGetSize(failRecord);
if (nFail > 0) { if (nFail > 0) {
mError("config dnode, cfg:%d, app:%p config:%s value:%s. total:%d, fail:%d", pCfgReq->dnodeId, pReq->info.ahandle, mError("config dnode, cfg:%d, app:%p config:%s value:%s. total:%d, fail:%d", pCfgReq->dnodeId, pReq->info.ahandle,

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

@ -593,7 +593,9 @@ int32_t mndStart(SMnode *pMnode) {
mndSetRestored(pMnode, true); mndSetRestored(pMnode, true);
} }
#ifndef TD_CHECK_ACTIVE
grantReset(pMnode, TSDB_GRANT_ALL, 0); grantReset(pMnode, TSDB_GRANT_ALL, 0);
#endif
return mndInitTimer(pMnode); return mndInitTimer(pMnode);
} }