From 3f7f6c15ab095759c1f696069e0be342aacd008e Mon Sep 17 00:00:00 2001 From: dmchen Date: Wed, 10 Jul 2024 10:22:40 +0000 Subject: [PATCH 01/13] fix/TS-4785 --- source/dnode/mgmt/mgmt_vnode/inc/vmInt.h | 4 ++ source/dnode/mgmt/mgmt_vnode/src/vmHandle.c | 5 ++- source/dnode/mgmt/mgmt_vnode/src/vmInt.c | 1 + source/dnode/mgmt/mgmt_vnode/src/vmWorker.c | 46 +++++++++++++++++++++ 4 files changed, 55 insertions(+), 1 deletion(-) diff --git a/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h b/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h index 85712d2797..c3b4bc0710 100644 --- a/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h +++ b/source/dnode/mgmt/mgmt_vnode/inc/vmInt.h @@ -34,12 +34,14 @@ typedef struct SVnodeMgmt { SAutoQWorkerPool streamPool; SWWorkerPool fetchPool; SSingleWorker mgmtWorker; + SSingleWorker mgmtMultiWorker; SHashObj *hash; TdThreadRwlock lock; SVnodesStat state; STfs *pTfs; TdThread thread; bool stop; + TdThreadMutex createLock; } SVnodeMgmt; typedef struct { @@ -69,6 +71,7 @@ typedef struct { STaosQueue *pQueryQ; STaosQueue *pStreamQ; STaosQueue *pFetchQ; + STaosQueue *pMultiMgmQ; } SVnodeObj; typedef struct { @@ -125,6 +128,7 @@ int32_t vmPutMsgToFetchQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg); int32_t vmPutMsgToStreamQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg); int32_t vmPutMsgToMergeQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg); int32_t vmPutMsgToMgmtQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg); +int32_t vmPutMsgToMultiMgmtQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg); #ifdef __cplusplus } diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c index fbe1925e3f..0669956fb8 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmHandle.c @@ -377,11 +377,14 @@ int32_t vmProcessCreateVnodeReq(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) { goto _OVER; } + taosThreadMutexLock(&pMgmt->createLock); code = vmWriteVnodeListToFile(pMgmt); if (code != 0) { code = terrno != 0 ? terrno : code; + taosThreadMutexUnlock(&pMgmt->createLock); goto _OVER; } + taosThreadMutexUnlock(&pMgmt->createLock); _OVER: if (code != 0) { @@ -985,7 +988,7 @@ SArray *vmGetMsgHandles() { if (dmSetMgmtHandle(pArray, TDMT_VND_COMPACT, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER; if (dmSetMgmtHandle(pArray, TDMT_VND_TRIM, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER; if (dmSetMgmtHandle(pArray, TDMT_VND_S3MIGRATE, vmPutMsgToWriteQueue, 0) == NULL) goto _OVER; - if (dmSetMgmtHandle(pArray, TDMT_DND_CREATE_VNODE, vmPutMsgToMgmtQueue, 0) == NULL) goto _OVER; + if (dmSetMgmtHandle(pArray, TDMT_DND_CREATE_VNODE, vmPutMsgToMultiMgmtQueue, 0) == NULL) goto _OVER; if (dmSetMgmtHandle(pArray, TDMT_DND_DROP_VNODE, vmPutMsgToMgmtQueue, 0) == NULL) goto _OVER; if (dmSetMgmtHandle(pArray, TDMT_DND_ALTER_VNODE_TYPE, vmPutMsgToMgmtQueue, 0) == NULL) goto _OVER; if (dmSetMgmtHandle(pArray, TDMT_DND_CHECK_VNODE_LEARNER_CATCHUP, vmPutMsgToMgmtQueue, 0) == NULL) goto _OVER; diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c index 296372a955..6f60e6adcd 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c @@ -580,6 +580,7 @@ static int32_t vmInit(SMgmtInputOpt *pInput, SMgmtOutputOpt *pOutput) { pMgmt->msgCb.qsizeFp = (GetQueueSizeFp)vmGetQueueSize; pMgmt->msgCb.mgmt = pMgmt; taosThreadRwlockInit(&pMgmt->lock, NULL); + taosThreadMutexInit(&pMgmt->createLock, NULL); pMgmt->pTfs = pInput->pTfs; if (pMgmt->pTfs == NULL) { diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c b/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c index 8c1b33cb14..c8fe03164b 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c @@ -28,6 +28,31 @@ static inline void vmSendRsp(SRpcMsg *pMsg, int32_t code) { tmsgSendRsp(&rsp); } +static void vmProcessMultiMgmtQueue(SQueueInfo *pInfo, SRpcMsg *pMsg) { + SVnodeMgmt *pMgmt = pInfo->ahandle; + int32_t code = -1; + const STraceId *trace = &pMsg->info.traceId; + + dGTrace("msg:%p, get from vnode-multi-mgmt queue", pMsg); + switch (pMsg->msgType) { + case TDMT_DND_CREATE_VNODE: + code = vmProcessCreateVnodeReq(pMgmt, pMsg); + break; + } + + if (IsReq(pMsg)) { + if (code != 0) { + if (terrno != 0) code = terrno; + dGError("msg:%p, failed to process since %s, type:%s", pMsg, tstrerror(code), TMSG_INFO(pMsg->msgType)); + } + vmSendRsp(pMsg, code); + } + + dGTrace("msg:%p, is freed, code:0x%x", pMsg, code); + rpcFreeCont(pMsg->pCont); + taosFreeQitem(pMsg); +} + static void vmProcessMgmtQueue(SQueueInfo *pInfo, SRpcMsg *pMsg) { SVnodeMgmt *pMgmt = pInfo->ahandle; int32_t code = -1; @@ -271,6 +296,13 @@ int32_t vmPutMsgToFetchQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) { return vmPutMsg int32_t vmPutMsgToStreamQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) { return vmPutMsgToQueue(pMgmt, pMsg, STREAM_QUEUE); } +int32_t vmPutMsgToMultiMgmtQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) { + const STraceId *trace = &pMsg->info.traceId; + dGTrace("msg:%p, put into vnode-multi-mgmt queue", pMsg); + taosWriteQitem(pMgmt->mgmtMultiWorker.queue, pMsg); + return 0; +} + int32_t vmPutMsgToMgmtQueue(SVnodeMgmt *pMgmt, SRpcMsg *pMsg) { const STraceId *trace = &pMsg->info.traceId; dGTrace("msg:%p, put into vnode-mgmt queue", pMsg); @@ -415,6 +447,20 @@ int32_t vmStartWorker(SVnodeMgmt *pMgmt) { if (tSingleWorkerInit(&pMgmt->mgmtWorker, &mgmtCfg) != 0) return -1; + int32_t threadNum = 0; + if (tsNumOfCores == 0) { + threadNum = 2; + } else { + threadNum = tsNumOfCores; + } + SSingleWorkerCfg multiMgmtCfg = {.min = threadNum, + .max = threadNum, + .name = "vnode-multi-mgmt", + .fp = (FItem)vmProcessMultiMgmtQueue, + .param = pMgmt}; + + if (tSingleWorkerInit(&pMgmt->mgmtMultiWorker, &multiMgmtCfg) != 0) return -1; + dDebug("vnode workers are initialized"); return 0; } From 0654cdd08e56629811e749613a1391ab0936818d Mon Sep 17 00:00:00 2001 From: dmchen Date: Wed, 10 Jul 2024 11:01:27 +0000 Subject: [PATCH 02/13] fix/TS-4785 --- source/dnode/mgmt/node_mgmt/src/dmEnv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/dnode/mgmt/node_mgmt/src/dmEnv.c b/source/dnode/mgmt/node_mgmt/src/dmEnv.c index 4be1af30b5..4739409d2c 100644 --- a/source/dnode/mgmt/node_mgmt/src/dmEnv.c +++ b/source/dnode/mgmt/node_mgmt/src/dmEnv.c @@ -310,7 +310,7 @@ static int32_t dmProcessAlterNodeTypeReq(EDndNodeType ntype, SRpcMsg *pMsg) { pWrapper = &pDnode->wrappers[ntype]; if (taosMkDir(pWrapper->path) != 0) { - dmReleaseWrapper(pWrapper); + taosThreadMutexUnlock(&pDnode->mutex); terrno = TAOS_SYSTEM_ERROR(errno); dError("failed to create dir:%s since %s", pWrapper->path, terrstr()); return -1; From b82bc71e34643cd39c6642938c6a5d544c2c6f4a Mon Sep 17 00:00:00 2001 From: dmchen Date: Thu, 11 Jul 2024 00:37:06 +0000 Subject: [PATCH 03/13] fix/TS-4785 --- source/dnode/mgmt/mgmt_vnode/src/vmInt.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c index 6f60e6adcd..9520c604c4 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c @@ -439,6 +439,8 @@ static void vmCloseVnodes(SVnodeMgmt *pMgmt) { dInfo("start to close all vnodes"); tSingleWorkerCleanup(&pMgmt->mgmtWorker); dInfo("vnodes mgmt worker is stopped"); + tSingleWorkerCleanup(&pMgmt->mgmtMultiWorker); + dInfo("vnodes multiple mgmt worker is stopped"); int32_t numOfVnodes = 0; SVnodeObj **ppVnodes = vmGetVnodeListFromHash(pMgmt, &numOfVnodes); @@ -506,6 +508,7 @@ static void vmCleanup(SVnodeMgmt *pMgmt) { vmStopWorker(pMgmt); vnodeCleanup(); taosThreadRwlockDestroy(&pMgmt->lock); + taosThreadRwlockDestroy(&pMgmt->createLock); taosMemoryFree(pMgmt); } From 98a6797a4deb325ccec6a3225c45c4718883407a Mon Sep 17 00:00:00 2001 From: dmchen Date: Thu, 11 Jul 2024 01:25:05 +0000 Subject: [PATCH 04/13] fix/TS-4785 --- source/dnode/mgmt/mgmt_vnode/src/vmInt.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c index 9520c604c4..aa9b009761 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmInt.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmInt.c @@ -508,7 +508,7 @@ static void vmCleanup(SVnodeMgmt *pMgmt) { vmStopWorker(pMgmt); vnodeCleanup(); taosThreadRwlockDestroy(&pMgmt->lock); - taosThreadRwlockDestroy(&pMgmt->createLock); + taosThreadMutexDestroy(&pMgmt->createLock); taosMemoryFree(pMgmt); } From 034c7b56ca3c4d097cd03208d30a0e26866ab912 Mon Sep 17 00:00:00 2001 From: dmchen Date: Thu, 11 Jul 2024 05:33:31 +0000 Subject: [PATCH 05/13] fix/TS-4785 --- source/dnode/mgmt/mgmt_vnode/src/vmWorker.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c b/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c index c8fe03164b..0415340be9 100644 --- a/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c +++ b/source/dnode/mgmt/mgmt_vnode/src/vmWorker.c @@ -448,7 +448,7 @@ int32_t vmStartWorker(SVnodeMgmt *pMgmt) { if (tSingleWorkerInit(&pMgmt->mgmtWorker, &mgmtCfg) != 0) return -1; int32_t threadNum = 0; - if (tsNumOfCores == 0) { + if (tsNumOfCores == 1) { threadNum = 2; } else { threadNum = tsNumOfCores; From 15573efbbc57a27c7a8c980a3cf5fa8fea5cfe5b Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Thu, 11 Jul 2024 14:57:40 +0800 Subject: [PATCH 06/13] fix(stream):commit the update of table meta. --- source/libs/stream/src/streamCheckpoint.c | 3 +++ 1 file changed, 3 insertions(+) diff --git a/source/libs/stream/src/streamCheckpoint.c b/source/libs/stream/src/streamCheckpoint.c index cdb5bf0b50..e555db82f6 100644 --- a/source/libs/stream/src/streamCheckpoint.c +++ b/source/libs/stream/src/streamCheckpoint.c @@ -442,6 +442,9 @@ int32_t streamTaskUpdateTaskCheckpointInfo(SStreamTask* pTask, bool restored, SV id, vgId, pReq->taskId, numOfTasks); } streamMetaWLock(pMeta); + if (streamMetaCommit(pMeta) < 0) { + // persist to disk + } } return TSDB_CODE_SUCCESS; From 45fc89c50f71313ea55ca155bbd81e05ec2d3809 Mon Sep 17 00:00:00 2001 From: wangmm0220 Date: Thu, 11 Jul 2024 14:59:52 +0800 Subject: [PATCH 07/13] fix:[TS-4921]null pointer error --- source/client/src/clientEnv.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/client/src/clientEnv.c b/source/client/src/clientEnv.c index ecfa1e3392..18907ede5d 100644 --- a/source/client/src/clientEnv.c +++ b/source/client/src/clientEnv.c @@ -127,7 +127,7 @@ static void generateWriteSlowLog(STscObj *pTscObj, SRequestObj *pRequest, int32_ cJSON_AddItemToObject(json, "error_info", cJSON_CreateString(tstrerror(pRequest->code))); cJSON_AddItemToObject(json, "type", cJSON_CreateNumber(reqType)); cJSON_AddItemToObject(json, "rows_num", cJSON_CreateNumber(pRequest->body.resInfo.numOfRows + pRequest->body.resInfo.totalRows)); - if(strlen(pRequest->sqlstr) > pTscObj->pAppInfo->monitorParas.tsSlowLogMaxLen){ + if(pRequest->sqlstr != NULL && strlen(pRequest->sqlstr) > pTscObj->pAppInfo->monitorParas.tsSlowLogMaxLen){ char tmp = pRequest->sqlstr[pTscObj->pAppInfo->monitorParas.tsSlowLogMaxLen]; pRequest->sqlstr[pTscObj->pAppInfo->monitorParas.tsSlowLogMaxLen] = '\0'; cJSON_AddItemToObject(json, "sql", cJSON_CreateString(pRequest->sqlstr)); From 4e684c400daecbf796e5c727854e6e9e0656f32f Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Thu, 11 Jul 2024 15:12:05 +0800 Subject: [PATCH 08/13] fix(stream): ignore the invalid_vgroup_id error for checkpoint_trans. --- source/dnode/mnode/impl/src/mndStream.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndStream.c b/source/dnode/mnode/impl/src/mndStream.c index 415d1ff9f0..223c29638f 100644 --- a/source/dnode/mnode/impl/src/mndStream.c +++ b/source/dnode/mnode/impl/src/mndStream.c @@ -966,8 +966,8 @@ static int32_t doSetCheckpointAction(SMnode *pMnode, STrans *pTrans, SStreamTask return -1; } - code = - setTransAction(pTrans, buf, tlen, TDMT_VND_STREAM_CHECK_POINT_SOURCE, &epset, TSDB_CODE_SYN_PROPOSE_NOT_READY, 0); + code = setTransAction(pTrans, buf, tlen, TDMT_VND_STREAM_CHECK_POINT_SOURCE, &epset, TSDB_CODE_SYN_PROPOSE_NOT_READY, + TSDB_CODE_VND_INVALID_VGROUP_ID); if (code != 0) { taosMemoryFree(buf); } From 93c06be262bcbfb710922d62611853ff7d69fc0a Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Thu, 11 Jul 2024 17:03:21 +0800 Subject: [PATCH 09/13] fix(stream): free checkpoint trigger block in case of redundant trigger block recved. --- source/libs/stream/src/streamCheckpoint.c | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/source/libs/stream/src/streamCheckpoint.c b/source/libs/stream/src/streamCheckpoint.c index e555db82f6..b490b0e02a 100644 --- a/source/libs/stream/src/streamCheckpoint.c +++ b/source/libs/stream/src/streamCheckpoint.c @@ -169,6 +169,8 @@ int32_t streamProcessCheckpointTriggerBlock(SStreamTask* pTask, SStreamDataBlock " recv expired checkpoint-trigger block, checkpointId:%" PRId64 " transId:%d, discard", id, vgId, pTask->chkInfo.checkpointId, checkpointId, transId); taosThreadMutexUnlock(&pTask->lock); + + streamFreeQitem((SStreamQueueItem*)pBlock); return TSDB_CODE_SUCCESS; } @@ -188,6 +190,8 @@ int32_t streamProcessCheckpointTriggerBlock(SStreamTask* pTask, SStreamDataBlock streamTaskOpenUpstreamInput(pTask, pBlock->srcTaskId); taosThreadMutexUnlock(&pTask->lock); + + streamFreeQitem((SStreamQueueItem*)pBlock); return TSDB_CODE_SUCCESS; } @@ -197,6 +201,8 @@ int32_t streamProcessCheckpointTriggerBlock(SStreamTask* pTask, SStreamDataBlock " discard", id, vgId, pActiveInfo->activeId, checkpointId); taosThreadMutexUnlock(&pTask->lock); + + streamFreeQitem((SStreamQueueItem*)pBlock); return TSDB_CODE_SUCCESS; } else { // checkpointId == pActiveInfo->activeId if (pActiveInfo->allUpstreamTriggerRecv == 1) { @@ -205,6 +211,7 @@ int32_t streamProcessCheckpointTriggerBlock(SStreamTask* pTask, SStreamDataBlock "checkpointId:%" PRId64 " transId:%d", id, vgId, checkpointId, transId); taosThreadMutexUnlock(&pTask->lock); + streamFreeQitem((SStreamQueueItem*)pBlock); return TSDB_CODE_SUCCESS; } @@ -219,6 +226,7 @@ int32_t streamProcessCheckpointTriggerBlock(SStreamTask* pTask, SStreamDataBlock pTask->id.idStr, p->upstreamTaskId, p->upstreamNodeId, p->checkpointId, p->recvTs); taosThreadMutexUnlock(&pTask->lock); + streamFreeQitem((SStreamQueueItem*)pBlock); return TSDB_CODE_SUCCESS; } } From 8c024c85546c9bd05f12ca4148ae8ed86d392bd7 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Fri, 12 Jul 2024 11:43:14 +0800 Subject: [PATCH 10/13] fix(stream): add some logs. --- source/dnode/mnode/impl/src/mndStream.c | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/source/dnode/mnode/impl/src/mndStream.c b/source/dnode/mnode/impl/src/mndStream.c index 223c29638f..1d20b16830 100644 --- a/source/dnode/mnode/impl/src/mndStream.c +++ b/source/dnode/mnode/impl/src/mndStream.c @@ -2317,6 +2317,8 @@ static int32_t extractNodeListFromStream(SMnode *pMnode, SArray *pNodeList) { } taosHashCleanup(pHash); + + mDebug("numOfNodes for stream after extract nodeInfo from stream", (int32_t)taosArrayGetSize(pNodeList)); return TSDB_CODE_SUCCESS; } @@ -2905,7 +2907,6 @@ void mndInitStreamExecInfo(SMnode *pMnode, SStreamExecInfo *pExecInfo) { } addAllStreamTasksIntoBuf(pMnode, pExecInfo); - extractNodeListFromStream(pMnode, pExecInfo->pNodeList); pExecInfo->initTaskList = true; } From cb42806148784530a7a2f70ca1349cc818850846 Mon Sep 17 00:00:00 2001 From: Haojun Liao Date: Fri, 12 Jul 2024 13:31:39 +0800 Subject: [PATCH 11/13] fix(stream): update some logs. --- source/dnode/mnode/impl/src/mndStream.c | 3 +-- source/dnode/mnode/impl/src/mndStreamHb.c | 2 +- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/source/dnode/mnode/impl/src/mndStream.c b/source/dnode/mnode/impl/src/mndStream.c index 1d20b16830..d57dc6e52e 100644 --- a/source/dnode/mnode/impl/src/mndStream.c +++ b/source/dnode/mnode/impl/src/mndStream.c @@ -59,7 +59,6 @@ static int32_t mndProcessNodeCheckReq(SRpcMsg *pMsg); static int32_t extractNodeListFromStream(SMnode *pMnode, SArray *pNodeList); static int32_t mndProcessStreamReqCheckpoint(SRpcMsg *pReq); static int32_t mndProcessCheckpointReport(SRpcMsg *pReq); -//static int32_t mndProcessConsensusCheckpointId(SRpcMsg *pMsg); static int32_t mndProcessConsensusInTmr(SRpcMsg *pMsg); static void doSendQuickRsp(SRpcHandleInfo *pInfo, int32_t msgSize, int32_t vgId, int32_t code); @@ -2318,7 +2317,7 @@ static int32_t extractNodeListFromStream(SMnode *pMnode, SArray *pNodeList) { taosHashCleanup(pHash); - mDebug("numOfNodes for stream after extract nodeInfo from stream", (int32_t)taosArrayGetSize(pNodeList)); + mDebug("numOfNodes:%d for stream after extract nodeInfo from stream", (int32_t)taosArrayGetSize(pNodeList)); return TSDB_CODE_SUCCESS; } diff --git a/source/dnode/mnode/impl/src/mndStreamHb.c b/source/dnode/mnode/impl/src/mndStreamHb.c index 1452ac77d2..bc10ec211d 100644 --- a/source/dnode/mnode/impl/src/mndStreamHb.c +++ b/source/dnode/mnode/impl/src/mndStreamHb.c @@ -255,7 +255,7 @@ int32_t mndProcessStreamHb(SRpcMsg *pReq) { mndInitStreamExecInfo(pMnode, &execInfo); if (!validateHbMsg(execInfo.pNodeList, req.vgId)) { - mError("invalid hbMsg from vgId:%d, discarded", req.vgId); + mError("vgId:%d not exists in nodeList buf, discarded", req.vgId); terrno = TSDB_CODE_INVALID_MSG; doSendHbMsgRsp(terrno, &pReq->info, req.vgId, req.msgId); From a1f23648b7edde2265580f5590e35c46bb32154b Mon Sep 17 00:00:00 2001 From: Yihao Deng Date: Mon, 15 Jul 2024 03:22:21 +0000 Subject: [PATCH 12/13] Minimize redundant logs --- source/libs/transport/src/transSvr.c | 1 + 1 file changed, 1 insertion(+) diff --git a/source/libs/transport/src/transSvr.c b/source/libs/transport/src/transSvr.c index 94d2aa4b00..3263c9fa52 100644 --- a/source/libs/transport/src/transSvr.c +++ b/source/libs/transport/src/transSvr.c @@ -431,6 +431,7 @@ static bool uvHandleReq(SSvrConn* pConn) { transMsg.info.traceId = pHead->traceId; transMsg.info.cliVer = htonl(pHead->compatibilityVer); transMsg.info.forbiddenIp = forbiddenIp; + transMsg.info.noResp = pHead->noResp; tGTrace("%s handle %p conn:%p translated to app, refId:%" PRIu64, transLabel(pTransInst), transMsg.info.handle, pConn, pConn->refId); From 3414738b63f237dac57dbae8b91c368298d015f5 Mon Sep 17 00:00:00 2001 From: Yihao Deng Date: Mon, 15 Jul 2024 03:26:45 +0000 Subject: [PATCH 13/13] Minimize redundant logs --- source/libs/transport/src/transSvr.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libs/transport/src/transSvr.c b/source/libs/transport/src/transSvr.c index 3263c9fa52..674bb86fb5 100644 --- a/source/libs/transport/src/transSvr.c +++ b/source/libs/transport/src/transSvr.c @@ -431,7 +431,7 @@ static bool uvHandleReq(SSvrConn* pConn) { transMsg.info.traceId = pHead->traceId; transMsg.info.cliVer = htonl(pHead->compatibilityVer); transMsg.info.forbiddenIp = forbiddenIp; - transMsg.info.noResp = pHead->noResp; + transMsg.info.noResp = pHead->noResp == 1 ? 1 : 0; tGTrace("%s handle %p conn:%p translated to app, refId:%" PRIu64, transLabel(pTransInst), transMsg.info.handle, pConn, pConn->refId);