From 908de1b301c2b411acd572e362977992bb418c93 Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Wed, 23 Nov 2022 15:59:34 +0800 Subject: [PATCH 1/5] fix: sysdb cache removed cause of drop db operation --- source/client/src/clientMsgHandler.c | 3 +++ source/libs/catalog/src/catalog.c | 3 +++ source/libs/catalog/src/ctgCache.c | 7 ++++--- 3 files changed, 10 insertions(+), 3 deletions(-) diff --git a/source/client/src/clientMsgHandler.c b/source/client/src/clientMsgHandler.c index 8437c93bae..1931704909 100644 --- a/source/client/src/clientMsgHandler.c +++ b/source/client/src/clientMsgHandler.c @@ -20,6 +20,7 @@ #include "query.h" #include "tdef.h" #include "tname.h" +#include "systable.h" static void setErrno(SRequestObj* pRequest, int32_t code) { pRequest->code = code; @@ -326,6 +327,8 @@ int32_t processDropDbRsp(void* param, SDataBuf* pMsg, int32_t code) { int32_t code = catalogGetHandle(pRequest->pTscObj->pAppInfo->clusterId, &pCatalog); if (TSDB_CODE_SUCCESS == code) { catalogRemoveDB(pCatalog, dropdbRsp.db, dropdbRsp.uid); + catalogRemoveDB(pCatalog, TSDB_INFORMATION_SCHEMA_DB, 0); + catalogRemoveDB(pCatalog, TSDB_PERFORMANCE_SCHEMA_DB, 0); } } diff --git a/source/libs/catalog/src/catalog.c b/source/libs/catalog/src/catalog.c index 2dcd681205..3a398d1551 100644 --- a/source/libs/catalog/src/catalog.c +++ b/source/libs/catalog/src/catalog.c @@ -1076,6 +1076,9 @@ int32_t catalogRefreshTableMeta(SCatalog* pCtg, SRequestConnInfo* pConn, const S SCtgTbMetaCtx ctx = {0}; ctx.pName = (SName*)pTableName; ctx.flag = CTG_FLAG_FORCE_UPDATE | CTG_FLAG_MAKE_STB(isSTable); + if (IS_SYS_DBNAME(ctx.pName->dbname)) { + CTG_FLAG_SET_SYS_DB(ctx.flag); + } CTG_API_LEAVE(ctgRefreshTbMeta(pCtg, pConn, &ctx, NULL, true)); } diff --git a/source/libs/catalog/src/ctgCache.c b/source/libs/catalog/src/ctgCache.c index fa38eeba0c..19b7ee32ae 100644 --- a/source/libs/catalog/src/ctgCache.c +++ b/source/libs/catalog/src/ctgCache.c @@ -663,6 +663,7 @@ int32_t ctgDropDbCacheEnqueue(SCatalog *pCtg, const char *dbFName, int64_t dbId) int32_t code = 0; SCtgCacheOperation *op = taosMemoryCalloc(1, sizeof(SCtgCacheOperation)); op->opId = CTG_OP_DROP_DB_CACHE; + op->syncOp = true; SCtgDropDBMsg *msg = taosMemoryMalloc(sizeof(SCtgDropDBMsg)); if (NULL == msg) { @@ -1612,11 +1613,11 @@ int32_t ctgOpUpdateVgroup(SCtgCacheOperation *operation) { dbCache = NULL; - if (!IS_SYS_DBNAME(dbFName)) { + //if (!IS_SYS_DBNAME(dbFName)) { tstrncpy(vgVersion.dbFName, dbFName, sizeof(vgVersion.dbFName)); CTG_ERR_JRET(ctgMetaRentUpdate(&msg->pCtg->dbRent, &vgVersion, vgVersion.dbId, sizeof(SDbVgVersion), ctgDbVgVersionSortCompare, ctgDbVgVersionSearchCompare)); - } + //} _return: @@ -1641,7 +1642,7 @@ int32_t ctgOpDropDbCache(SCtgCacheOperation *operation) { goto _return; } - if (dbCache->dbId != msg->dbId) { + if (msg->dbId && dbCache->dbId != msg->dbId) { ctgInfo("dbId already updated, dbFName:%s, dbId:0x%" PRIx64 ", targetId:0x%" PRIx64, msg->dbFName, dbCache->dbId, msg->dbId); goto _return; From a222e9ad7b7835c4f9ac7a7b1c125edf9fd399cc Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Wed, 23 Nov 2022 16:09:03 +0800 Subject: [PATCH 2/5] fix: update sysdb vgroup info after db dropped --- source/client/src/clientMsgHandler.c | 10 ++++++++-- 1 file changed, 8 insertions(+), 2 deletions(-) diff --git a/source/client/src/clientMsgHandler.c b/source/client/src/clientMsgHandler.c index 1931704909..fe35d9679d 100644 --- a/source/client/src/clientMsgHandler.c +++ b/source/client/src/clientMsgHandler.c @@ -327,8 +327,14 @@ int32_t processDropDbRsp(void* param, SDataBuf* pMsg, int32_t code) { int32_t code = catalogGetHandle(pRequest->pTscObj->pAppInfo->clusterId, &pCatalog); if (TSDB_CODE_SUCCESS == code) { catalogRemoveDB(pCatalog, dropdbRsp.db, dropdbRsp.uid); - catalogRemoveDB(pCatalog, TSDB_INFORMATION_SCHEMA_DB, 0); - catalogRemoveDB(pCatalog, TSDB_PERFORMANCE_SCHEMA_DB, 0); + STscObj* pTscObj = pRequest->pTscObj; + + SRequestConnInfo conn = {.pTrans = pTscObj->pAppInfo->pTransporter, + .requestId = pRequest->requestId, + .requestObjRefId = pRequest->self, + .mgmtEps = getEpSet_s(&pTscObj->pAppInfo->mgmtEp)}; + catalogRefreshDBVgInfo(pCatalog, &conn, TSDB_INFORMATION_SCHEMA_DB); + catalogRefreshDBVgInfo(pCatalog, &conn, TSDB_PERFORMANCE_SCHEMA_DB); } } From 1053e25ba2a7851bb93a0617edcc0b80b4237f0f Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Thu, 24 Nov 2022 16:57:41 +0800 Subject: [PATCH 3/5] fix: fix sysdb fname error --- source/client/src/clientMsgHandler.c | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/source/client/src/clientMsgHandler.c b/source/client/src/clientMsgHandler.c index fe35d9679d..78e2bc9d2d 100644 --- a/source/client/src/clientMsgHandler.c +++ b/source/client/src/clientMsgHandler.c @@ -333,8 +333,11 @@ int32_t processDropDbRsp(void* param, SDataBuf* pMsg, int32_t code) { .requestId = pRequest->requestId, .requestObjRefId = pRequest->self, .mgmtEps = getEpSet_s(&pTscObj->pAppInfo->mgmtEp)}; - catalogRefreshDBVgInfo(pCatalog, &conn, TSDB_INFORMATION_SCHEMA_DB); - catalogRefreshDBVgInfo(pCatalog, &conn, TSDB_PERFORMANCE_SCHEMA_DB); + char dbFName[TSDB_DB_FNAME_LEN]; + snprintf(dbFName, sizeof(dbFName) - 1, "%d.%s", pTscObj->acctId, TSDB_INFORMATION_SCHEMA_DB); + catalogRefreshDBVgInfo(pCatalog, &conn, dbFName); + snprintf(dbFName, sizeof(dbFName) - 1, "%d.%s", pTscObj->acctId, TSDB_PERFORMANCE_SCHEMA_DB); + catalogRefreshDBVgInfo(pCatalog, &conn, dbFName); } } From bdce9ca6b5fbf19ae773b4834eb20effefe91672 Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Thu, 24 Nov 2022 18:46:11 +0800 Subject: [PATCH 4/5] fix: hb response message memory leak --- source/client/src/clientHb.c | 15 ++++++++++----- 1 file changed, 10 insertions(+), 5 deletions(-) diff --git a/source/client/src/clientHb.c b/source/client/src/clientHb.c index 0f881beb66..6bdc835217 100644 --- a/source/client/src/clientHb.c +++ b/source/client/src/clientHb.c @@ -69,7 +69,8 @@ static int32_t hbProcessDBInfoRsp(void *value, int32_t valueLen, struct SCatalog } else { SDBVgInfo *vgInfo = taosMemoryCalloc(1, sizeof(SDBVgInfo)); if (NULL == vgInfo) { - return TSDB_CODE_TSC_OUT_OF_MEMORY; + code = TSDB_CODE_TSC_OUT_OF_MEMORY; + goto _return; } vgInfo->vgVersion = rsp->vgVersion; @@ -81,7 +82,8 @@ static int32_t hbProcessDBInfoRsp(void *value, int32_t valueLen, struct SCatalog if (NULL == vgInfo->vgHash) { taosMemoryFree(vgInfo); tscError("hash init[%d] failed", rsp->vgNum); - return TSDB_CODE_TSC_OUT_OF_MEMORY; + code = TSDB_CODE_TSC_OUT_OF_MEMORY; + goto _return; } for (int32_t j = 0; j < rsp->vgNum; ++j) { @@ -90,7 +92,8 @@ static int32_t hbProcessDBInfoRsp(void *value, int32_t valueLen, struct SCatalog tscError("hash push failed, errno:%d", errno); taosHashCleanup(vgInfo->vgHash); taosMemoryFree(vgInfo); - return TSDB_CODE_TSC_OUT_OF_MEMORY; + code = TSDB_CODE_TSC_OUT_OF_MEMORY; + goto _return; } } @@ -98,12 +101,14 @@ static int32_t hbProcessDBInfoRsp(void *value, int32_t valueLen, struct SCatalog } if (code) { - return code; + goto _return; } } +_return: + tFreeSUseDbBatchRsp(&batchUseRsp); - return TSDB_CODE_SUCCESS; + return code; } static int32_t hbProcessStbInfoRsp(void *value, int32_t valueLen, struct SCatalog *pCatalog) { From 724038b49cff1aa8484919df101c5cfa20be4c83 Mon Sep 17 00:00:00 2001 From: dapan1121 Date: Fri, 25 Nov 2022 12:05:33 +0800 Subject: [PATCH 5/5] fix: fix use db deserialize issue --- source/common/src/tmsg.c | 32 +++++++++++++++----------------- 1 file changed, 15 insertions(+), 17 deletions(-) diff --git a/source/common/src/tmsg.c b/source/common/src/tmsg.c index 7575554bcf..cd97ceaae1 100644 --- a/source/common/src/tmsg.c +++ b/source/common/src/tmsg.c @@ -2537,24 +2537,22 @@ int32_t tDeserializeSUseDbRspImp(SDecoder *pDecoder, SUseDbRsp *pRsp) { if (tDecodeI16(pDecoder, &pRsp->hashSuffix) < 0) return -1; if (tDecodeI8(pDecoder, &pRsp->hashMethod) < 0) return -1; - if (pRsp->vgNum <= 0) { - return 0; - } + if (pRsp->vgNum > 0) { + pRsp->pVgroupInfos = taosArrayInit(pRsp->vgNum, sizeof(SVgroupInfo)); + if (pRsp->pVgroupInfos == NULL) { + terrno = TSDB_CODE_OUT_OF_MEMORY; + return -1; + } - pRsp->pVgroupInfos = taosArrayInit(pRsp->vgNum, sizeof(SVgroupInfo)); - if (pRsp->pVgroupInfos == NULL) { - terrno = TSDB_CODE_OUT_OF_MEMORY; - return -1; - } - - for (int32_t i = 0; i < pRsp->vgNum; ++i) { - SVgroupInfo vgInfo = {0}; - if (tDecodeI32(pDecoder, &vgInfo.vgId) < 0) return -1; - if (tDecodeU32(pDecoder, &vgInfo.hashBegin) < 0) return -1; - if (tDecodeU32(pDecoder, &vgInfo.hashEnd) < 0) return -1; - if (tDecodeSEpSet(pDecoder, &vgInfo.epSet) < 0) return -1; - if (tDecodeI32(pDecoder, &vgInfo.numOfTable) < 0) return -1; - taosArrayPush(pRsp->pVgroupInfos, &vgInfo); + for (int32_t i = 0; i < pRsp->vgNum; ++i) { + SVgroupInfo vgInfo = {0}; + if (tDecodeI32(pDecoder, &vgInfo.vgId) < 0) return -1; + if (tDecodeU32(pDecoder, &vgInfo.hashBegin) < 0) return -1; + if (tDecodeU32(pDecoder, &vgInfo.hashEnd) < 0) return -1; + if (tDecodeSEpSet(pDecoder, &vgInfo.epSet) < 0) return -1; + if (tDecodeI32(pDecoder, &vgInfo.numOfTable) < 0) return -1; + taosArrayPush(pRsp->pVgroupInfos, &vgInfo); + } } if (tDecodeI32(pDecoder, &pRsp->errCode) < 0) return -1;