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

Merge branch '3.0' into enh/opt-transport

This commit is contained in:
yihaoDeng 2024-09-18 08:50:10 +08:00
parent 3934898ffd
commit 2db729583f
3 changed files with 5 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
source/libs/scheduler/src/schRemote.c
View File

@ -503,7 +503,7 @@ int32_t schHandleDropCallback(void *param, SDataBuf *pMsg, int32_t code) {
(void)rpcReleaseHandle(pMsg->handle, TAOS_CONN_CLIENT); // ignore error (void)rpcReleaseHandle(pMsg->handle, TAOS_CONN_CLIENT); // ignore error
if (pMsg->handle == NULL) { if (pMsg->handle == NULL) {
ASSERT(0); qError("sch handle is NULL, may be already released and mem lea");
} }
if (pMsg) { if (pMsg) {
taosMemoryFree(pMsg->pData); taosMemoryFree(pMsg->pData);

2
source/libs/transport/src/transCli.c
View File

@ -557,7 +557,6 @@ void cliHandleResp(SCliConn* conn) {
taosMemoryFree(pHead); taosMemoryFree(pHead);
tDebug("%s conn %p recv invalid packet ", CONN_GET_INST_LABEL(conn), conn); tDebug("%s conn %p recv invalid packet ", CONN_GET_INST_LABEL(conn), conn);
// TODO: notify cb // TODO: notify cb
// ASSERT(0);
pThrd->notifyExceptCb(pThrd, NULL, NULL); pThrd->notifyExceptCb(pThrd, NULL, NULL);
return; return;
} }
@ -616,6 +615,7 @@ void cliHandleResp(SCliConn* conn) {
if (cliMayRecycleConn(conn)) { if (cliMayRecycleConn(conn)) {
return; return;
} }
cliConnCheckTimoutMsg(conn);
cliConnMayUpdateTimer(conn, READ_TIMEOUT); cliConnMayUpdateTimer(conn, READ_TIMEOUT);

7
source/libs/transport/src/transSvr.c
View File

@ -555,14 +555,14 @@ static bool uvHandleReq(SSvrConn* pConn) {
} }
if (pHead->seqNum == 0) { if (pHead->seqNum == 0) {
// ASSERT(0); STraceId* trace = &pHead->traceId;
tGError("%s conn %p received invalid seqNum, msgType:%s", transLabel(pInst), pConn, TMSG_INFO(pHead->msgType));
return false;
} }
transMsg.info.handle = (void*)transAcquireExHandle(uvGetConnRefOfThrd(pThrd), pConn->refId); transMsg.info.handle = (void*)transAcquireExHandle(uvGetConnRefOfThrd(pThrd), pConn->refId);
transMsg.info.refIdMgt = pThrd->connRefMgt; transMsg.info.refIdMgt = pThrd->connRefMgt;
// ASSERTS(transMsg.info.handle != NULL, "trans-svr failed to alloc handle to msg");
// pHead->noResp = 1, // pHead->noResp = 1,
// 1. server application should not send resp on handle // 1. server application should not send resp on handle
// 2. once send out data, cli conn released to conn pool immediately // 2. once send out data, cli conn released to conn pool immediately
@ -729,7 +729,6 @@ static int uvPrepareSendData(SSvrRespMsg* smsg, uv_buf_t* wb) {
// handle invalid drop_task resp, TD-20098 // handle invalid drop_task resp, TD-20098
if (pConn->inType == TDMT_SCH_DROP_TASK && pMsg->code == TSDB_CODE_VND_INVALID_VGROUP_ID) { if (pConn->inType == TDMT_SCH_DROP_TASK && pMsg->code == TSDB_CODE_VND_INVALID_VGROUP_ID) {
// ASSERT(0);
// (void)transQueuePop(&pConn->resps); // (void)transQueuePop(&pConn->resps);
// destroySmsg(smsg); // destroySmsg(smsg);
// return TSDB_CODE_INVALID_MSG; // return TSDB_CODE_INVALID_MSG;