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

Fix mem leak.

This commit is contained in:
xiao-77 2025-01-09 10:50:23 +08:00
parent ff1ecebdf2
commit 9eb1239783
2 changed files with 18 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -312,28 +312,24 @@ int32_t mndInitWriteCfg(SMnode *pMnode) {
if ((code = mndSetCreateConfigCommitLogs(pTrans, versionObj)) != 0) { if ((code = mndSetCreateConfigCommitLogs(pTrans, versionObj)) != 0) {
mError("failed to init mnd config version, since %s", tstrerror(code)); mError("failed to init mnd config version, since %s", tstrerror(code));
tFreeSConfigObj(versionObj); tFreeSConfigObj(versionObj);
taosMemoryFree(versionObj);
goto _OVER; goto _OVER;
} }
tFreeSConfigObj(versionObj); tFreeSConfigObj(versionObj);
taosMemoryFree(versionObj);
sz = taosArrayGetSize(taosGetGlobalCfg(tsCfg)); sz = taosArrayGetSize(taosGetGlobalCfg(tsCfg));
for (int i = 0; i < sz; ++i) { for (int i = 0; i < sz; ++i) {
SConfigItem *item = taosArrayGet(taosGetGlobalCfg(tsCfg), i); SConfigItem *item = taosArrayGet(taosGetGlobalCfg(tsCfg), i);
SConfigObj *obj = mndInitConfigObj(item); SConfigObj *pObj = mndInitConfigObj(item);
if (obj == NULL) { if (pObj == NULL) {
code = terrno; code = terrno;
goto _OVER; goto _OVER;
} }
if ((code = mndSetCreateConfigCommitLogs(pTrans, obj)) != 0) { if ((code = mndSetCreateConfigCommitLogs(pTrans, pObj)) != 0) {
mError("failed to init mnd config:%s, since %s", item->name, tstrerror(code)); mError("failed to init mnd config:%s, since %s", item->name, tstrerror(code));
tFreeSConfigObj(obj); tFreeSConfigObj(pObj);
taosMemoryFree(obj);
goto _OVER; goto _OVER;
} }
tFreeSConfigObj(obj); tFreeSConfigObj(pObj);
taosMemoryFree(obj);
} }
if ((code = mndTransPrepare(pMnode, pTrans)) != 0) goto _OVER; if ((code = mndTransPrepare(pMnode, pTrans)) != 0) goto _OVER;
@ -372,11 +368,11 @@ static int32_t mndTryRebuildConfigSdb(SRpcMsg *pReq) {
if (!mndIsLeader(pMnode)) { if (!mndIsLeader(pMnode)) {
return TSDB_CODE_SUCCESS; return TSDB_CODE_SUCCESS;
} }
int32_t code = 0; int32_t code = 0;
int32_t sz = -1; int32_t sz = -1;
STrans *pTrans = NULL; STrans *pTrans = NULL;
SAcctObj *vObj = NULL, *obj = NULL; SConfigObj *vObj = NULL;
SArray *addArray = NULL; SArray *addArray = NULL;
vObj = sdbAcquire(pMnode->pSdb, SDB_CFG, "tsmmConfigVersion"); vObj = sdbAcquire(pMnode->pSdb, SDB_CFG, "tsmmConfigVersion");
if (vObj == NULL) { if (vObj == NULL) {
@ -387,8 +383,9 @@ static int32_t mndTryRebuildConfigSdb(SRpcMsg *pReq) {
addArray = taosArrayInit(4, sizeof(SConfigObj)); addArray = taosArrayInit(4, sizeof(SConfigObj));
for (int i = 0; i < sz; ++i) { for (int i = 0; i < sz; ++i) {
SConfigItem *item = taosArrayGet(taosGetGlobalCfg(tsCfg), i); SConfigItem *item = taosArrayGet(taosGetGlobalCfg(tsCfg), i);
obj = sdbAcquire(pMnode->pSdb, SDB_CFG, item->name); SConfigObj *obj = sdbAcquire(pMnode->pSdb, SDB_CFG, item->name);
if (obj == NULL) { if (obj == NULL) {
mInfo("config:%s, not exist in sdb, try to add it", item->name);
SConfigObj *newObj = mndInitConfigObj(item); SConfigObj *newObj = mndInitConfigObj(item);
if (newObj == NULL) { if (newObj == NULL) {
code = terrno; code = terrno;
@ -422,7 +419,6 @@ _exit:
mError("failed to try rebuild config in sdb, since %s", tstrerror(code)); mError("failed to try rebuild config in sdb, since %s", tstrerror(code));
} }
sdbRelease(pMnode->pSdb, vObj); sdbRelease(pMnode->pSdb, vObj);
sdbRelease(pMnode->pSdb, obj);
cfgObjArrayCleanUp(addArray); cfgObjArrayCleanUp(addArray);
mndTransDrop(pTrans); mndTransDrop(pTrans);
TAOS_RETURN(code); TAOS_RETURN(code);

14
source/dnode/mnode/impl/src/mndDef.c
View File

@ -731,10 +731,9 @@ void *tDecodeSubscribeObj(const void *buf, SMqSubscribeObj *pSub, int8_t sver) {
} }
SConfigObj *mndInitConfigObj(SConfigItem *pItem) { SConfigObj *mndInitConfigObj(SConfigItem *pItem) {
SConfigObj *pObj = taosMemoryCalloc(1, sizeof(SConfigObj)); SConfigObj *pObj;
if (pObj == NULL) { memset(pObj, 0, sizeof(SConfigObj));
return NULL;
}
tstrncpy(pObj->name, pItem->name, CFG_NAME_MAX_LEN); tstrncpy(pObj->name, pItem->name, CFG_NAME_MAX_LEN);
pObj->dtype = pItem->dtype; pObj->dtype = pItem->dtype;
switch (pItem->dtype) { switch (pItem->dtype) {
@ -823,10 +822,9 @@ int32_t mndUpdateObj(SConfigObj *pObjNew, const char *name, char *value) {
} }
SConfigObj *mndInitConfigVersion() { SConfigObj *mndInitConfigVersion() {
SConfigObj *pObj = taosMemoryCalloc(1, sizeof(SConfigObj)); SConfigObj *pObj;
if (pObj == NULL) { memset(pObj, 0, sizeof(SConfigObj));
return NULL;
}
tstrncpy(pObj->name, "tsmmConfigVersion", CFG_NAME_MAX_LEN); tstrncpy(pObj->name, "tsmmConfigVersion", CFG_NAME_MAX_LEN);
pObj->dtype = CFG_DTYPE_INT32; pObj->dtype = CFG_DTYPE_INT32;
pObj->i32 = 0; pObj->i32 = 0;