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

fix:[TD-31017]process return value in vnode for tmq

This commit is contained in:
wangmm0220 2024-07-28 03:34:48 +08:00
parent 43696418c1
commit 50afa39ab4
1 changed files with 4 additions and 23 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

27
source/client/src/clientMsgHandler.c
View File

@ -245,12 +245,7 @@ int32_t processUseDbRsp(void* param, SDataBuf* pMsg, int32_t code) {
if (TSDB_CODE_MND_DB_NOT_EXIST == code || TSDB_CODE_MND_DB_IN_CREATING == code || if (TSDB_CODE_MND_DB_NOT_EXIST == code || TSDB_CODE_MND_DB_IN_CREATING == code ||
TSDB_CODE_MND_DB_IN_DROPPING == code) { TSDB_CODE_MND_DB_IN_DROPPING == code) {
SUseDbRsp usedbRsp = {0}; SUseDbRsp usedbRsp = {0};
code = tDeserializeSUseDbRsp(pMsg->pData, pMsg->len, &usedbRsp); (void)tDeserializeSUseDbRsp(pMsg->pData, pMsg->len, &usedbRsp);
if(code != 0){
tscError("0x%" PRIx64 " failed to deserialize SUseDbRsp", pRequest->requestId);
tFreeSUsedbRsp(&usedbRsp);
return TAOS_GET_TERRNO(code);
}
struct SCatalog* pCatalog = NULL; struct SCatalog* pCatalog = NULL;
if (usedbRsp.vgVersion >= 0) { // cached in local if (usedbRsp.vgVersion >= 0) { // cached in local
@ -260,13 +255,7 @@ int32_t processUseDbRsp(void* param, SDataBuf* pMsg, int32_t code) {
tscWarn("0x%" PRIx64 "catalogGetHandle failed, clusterId:%" PRIx64 ", error:%s", pRequest->requestId, clusterId, tscWarn("0x%" PRIx64 "catalogGetHandle failed, clusterId:%" PRIx64 ", error:%s", pRequest->requestId, clusterId,
tstrerror(code1)); tstrerror(code1));
} else { } else {
code = catalogRemoveDB(pCatalog, usedbRsp.db, usedbRsp.uid); (void)catalogRemoveDB(pCatalog, usedbRsp.db, usedbRsp.uid);
if (code != TSDB_CODE_SUCCESS) {
tscError("0x%" PRIx64 "catalogRemoveDB failed, db:%s, uid:%" PRId64 ", error:%s", pRequest->requestId,
usedbRsp.db, usedbRsp.uid, tstrerror(code));
tFreeSUsedbRsp(&usedbRsp);
return TAOS_GET_TERRNO(code);
}
} }
} }
tFreeSUsedbRsp(&usedbRsp); tFreeSUsedbRsp(&usedbRsp);
@ -288,12 +277,7 @@ int32_t processUseDbRsp(void* param, SDataBuf* pMsg, int32_t code) {
} }
SUseDbRsp usedbRsp = {0}; SUseDbRsp usedbRsp = {0};
code = tDeserializeSUseDbRsp(pMsg->pData, pMsg->len, &usedbRsp); (void)tDeserializeSUseDbRsp(pMsg->pData, pMsg->len, &usedbRsp);
if (code != 0){
tscError("0x%" PRIx64 " failed to deserialize SUseDbRsp", pRequest->requestId);
tFreeSUsedbRsp(&usedbRsp);
return TAOS_GET_TERRNO(code);
}
if (strlen(usedbRsp.db) == 0) { if (strlen(usedbRsp.db) == 0) {
if (usedbRsp.errCode != 0) { if (usedbRsp.errCode != 0) {
@ -335,10 +319,7 @@ int32_t processUseDbRsp(void* param, SDataBuf* pMsg, int32_t code) {
tscWarn("catalogGetHandle failed, clusterId:%" PRIx64 ", error:%s", pRequest->pTscObj->pAppInfo->clusterId, tscWarn("catalogGetHandle failed, clusterId:%" PRIx64 ", error:%s", pRequest->pTscObj->pAppInfo->clusterId,
tstrerror(code1)); tstrerror(code1));
} else { } else {
code = catalogUpdateDBVgInfo(pCatalog, output.db, output.dbId, output.dbVgroup); (void)catalogUpdateDBVgInfo(pCatalog, output.db, output.dbId, output.dbVgroup);
if(code != 0){
tscError("0x%" PRIx64 " failed to update db vgroup info since %s", pRequest->requestId, tstrerror(code));
}
output.dbVgroup = NULL; output.dbVgroup = NULL;
} }
} }