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

handle quit error

This commit is contained in:
yihaoDeng 2024-10-30 16:27:44 +08:00
parent 57743282db
commit 8d4813590f
1 changed files with 4 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -1477,13 +1477,12 @@ int32_t cliBatchSend(SCliConn* pConn, int8_t direct) {
totalLen += msgLen; totalLen += msgLen;
pCliMsg->seq = pConn->seq; pCliMsg->seq = pConn->seq;
pCliMsg->inSendQ = 1; pCliMsg->sent = 1;
STraceId* trace = &pCliMsg->msg.info.traceId; STraceId* trace = &pCliMsg->msg.info.traceId;
tGDebug("%s conn %p %s is sent to %s, local info:%s, seq:%" PRId64 ", sid:%" PRId64 "", CONN_GET_INST_LABEL(pConn), tGDebug("%s conn %p %s is sent to %s, local info:%s, seq:%" PRId64 ", sid:%" PRId64 "", CONN_GET_INST_LABEL(pConn),
pConn, TMSG_INFO(pReq->msgType), pConn->dst, pConn->src, pConn->seq, pReq->info.qId); pConn, TMSG_INFO(pReq->msgType), pConn->dst, pConn->src, pConn->seq, pReq->info.qId);
// QUEUE_PUSH(&reqToSend, &pCliMsg->q);
transQueuePush(&pConn->reqsSentOut, &pCliMsg->q); transQueuePush(&pConn->reqsSentOut, &pCliMsg->q);
QUEUE_INIT(&pCliMsg->sendQ); QUEUE_INIT(&pCliMsg->sendQ);
QUEUE_PUSH(&reqToSend, &pCliMsg->sendQ); QUEUE_PUSH(&reqToSend, &pCliMsg->sendQ);
@ -1500,10 +1499,9 @@ int32_t cliBatchSend(SCliConn* pConn, int8_t direct) {
tError("%s conn %p failed to send msg since %s", CONN_GET_INST_LABEL(pConn), pConn, tstrerror(terrno)); tError("%s conn %p failed to send msg since %s", CONN_GET_INST_LABEL(pConn), pConn, tstrerror(terrno));
while (!QUEUE_IS_EMPTY(&reqToSend)) { while (!QUEUE_IS_EMPTY(&reqToSend)) {
queue* h = QUEUE_HEAD(&reqToSend); queue* h = QUEUE_HEAD(&reqToSend);
QUEUE_REMOVE(h);
SCliReq* pCliMsg = QUEUE_DATA(h, SCliReq, sendQ); SCliReq* pCliMsg = QUEUE_DATA(h, SCliReq, sendQ);
pCliMsg->inSendQ = 0; removeReqFromSendQ(pCliMsg);
} }
transRefCliHandle(pConn); transRefCliHandle(pConn);
@ -1520,10 +1518,8 @@ int32_t cliBatchSend(SCliConn* pConn, int8_t direct) {
tError("%s conn %p failed to send msg since %s", CONN_GET_INST_LABEL(pConn), pConn, uv_err_name(ret)); tError("%s conn %p failed to send msg since %s", CONN_GET_INST_LABEL(pConn), pConn, uv_err_name(ret));
while (!QUEUE_IS_EMPTY(&pWreq->node)) { while (!QUEUE_IS_EMPTY(&pWreq->node)) {
queue* h = QUEUE_HEAD(&pWreq->node); queue* h = QUEUE_HEAD(&pWreq->node);
QUEUE_REMOVE(h);
SCliReq* pCliMsg = QUEUE_DATA(h, SCliReq, sendQ); SCliReq* pCliMsg = QUEUE_DATA(h, SCliReq, sendQ);
pCliMsg->inSendQ = 0; removeReqFromSendQ(pCliMsg);
} }
freeWReqToWQ(&pConn->wq, req->data); freeWReqToWQ(&pConn->wq, req->data);