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

add config

This commit is contained in:
yihaoDeng 2024-09-30 09:38:21 +08:00
parent 0277f22f3e
commit d379d8994e
2 changed files with 17 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -285,7 +285,7 @@ static void cliWalkCb(uv_handle_t* handle, void* arg);
static FORCE_INLINE int32_t destroyAllReqs(SCliConn* SCliConn); static FORCE_INLINE int32_t destroyAllReqs(SCliConn* SCliConn);
static FORCE_INLINE bool filterAllReq(void* e, void* arg); static FORCE_INLINE bool filterAllReq(void* key, void* arg);
static FORCE_INLINE bool filerBySeq(void* key, void* arg); static FORCE_INLINE bool filerBySeq(void* key, void* arg);
static FORCE_INLINE bool filterByQid(void* key, void* arg); static FORCE_INLINE bool filterByQid(void* key, void* arg);
static FORCE_INLINE bool filterToDebug_timeoutMsg(void* key, void* arg); static FORCE_INLINE bool filterToDebug_timeoutMsg(void* key, void* arg);

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

@ -441,23 +441,23 @@ static int32_t uvMayHandleReleaseReq(SSvrConn* pConn, STransMsgHead* pHead) {
int64_t qId = taosHton64(pHead->qid); int64_t qId = taosHton64(pHead->qid);
if (qId <= 0) { if (qId <= 0) {
tError("conn %p recv release, but invalid qid:%" PRId64 "", pConn, qId); tError("conn %p recv release, but invalid qid:%" PRId64 "", pConn, qId);
return TSDB_CODE_RPC_NO_STATE;
}
void* p = taosHashGet(pConn->pQTable, &qId, sizeof(qId));
if (p == NULL) {
code = TSDB_CODE_RPC_NO_STATE; code = TSDB_CODE_RPC_NO_STATE;
tTrace("conn %p recv release, and releady release by server qid:%" PRId64 "", pConn, qId);
} else { } else {
SSvrRegArg* arg = p; void* p = taosHashGet(pConn->pQTable, &qId, sizeof(qId));
(pInst->cfp)(pInst->parent, &(arg->msg), NULL); if (p == NULL) {
tTrace("conn %p recv release, notify server app, qid:%" PRId64 "", pConn, qId); code = TSDB_CODE_RPC_NO_STATE;
tTrace("conn %p recv release, and releady release by server qid:%" PRId64 "", pConn, qId);
} else {
SSvrRegArg* arg = p;
(pInst->cfp)(pInst->parent, &(arg->msg), NULL);
tTrace("conn %p recv release, notify server app, qid:%" PRId64 "", pConn, qId);
code = taosHashRemove(pConn->pQTable, &qId, sizeof(qId)); code = taosHashRemove(pConn->pQTable, &qId, sizeof(qId));
if (code != 0) { if (code != 0) {
tDebug("conn %p failed to remove qid:%" PRId64 "", pConn, qId); tDebug("conn %p failed to remove qid:%" PRId64 "", pConn, qId);
}
tTrace("conn %p clear state,qid:%" PRId64 "", pConn, qId);
} }
tTrace("conn %p clear state,qid:%" PRId64 "", pConn, qId);
} }
STransMsg tmsg = {.code = code, STransMsg tmsg = {.code = code,
@ -468,7 +468,8 @@ static int32_t uvMayHandleReleaseReq(SSvrConn* pConn, STransMsgHead* pHead) {
SSvrRespMsg* srvMsg = taosMemoryCalloc(1, sizeof(SSvrRespMsg)); SSvrRespMsg* srvMsg = taosMemoryCalloc(1, sizeof(SSvrRespMsg));
if (srvMsg == NULL) { if (srvMsg == NULL) {
tError("conn %p recv release, but invalid qid:%" PRId64 "", pConn, qId); tError("conn %p recv release, failed to send release-resp since %s", pConn, terrno);
taosMemoryFree(pHead);
return terrno; return terrno;
} }
srvMsg->msg = tmsg; srvMsg->msg = tmsg;
@ -479,7 +480,7 @@ static int32_t uvMayHandleReleaseReq(SSvrConn* pConn, STransMsgHead* pHead) {
uvStartSendRespImpl(srvMsg); uvStartSendRespImpl(srvMsg);
taosMemoryFree(pHead); taosMemoryFree(pHead);
return code; return TSDB_CODE_RPC_ASYNC_IN_PROCESS;
} }
return 0; return 0;
} }