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

Merge remote-tracking branch 'origin/3.0' into enh/opt-transport

This commit is contained in:
yihaoDeng 2024-09-28 13:57:50 +08:00
parent 8b2754fe99
commit 886521619d
2 changed files with 8 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -401,7 +401,7 @@ void cliConnMayUpdateTimer(SCliConn* conn, int timeout) {
} }
int ret = uv_timer_start(conn->timer, cliConnTimeout__checkReq, timeout, 0); int ret = uv_timer_start(conn->timer, cliConnTimeout__checkReq, timeout, 0);
if (ret != 0) { if (ret != 0) {
tError("%s conn %p failed to start timer %p, ret:%d", CONN_GET_INST_LABEL(conn), conn, conn->timer, tError("%s conn %p failed to start timer %p since %s", CONN_GET_INST_LABEL(conn), conn, conn->timer,
uv_err_name(ret)); uv_err_name(ret));
} }
} }
@ -579,11 +579,11 @@ void cliHandleResp(SCliConn* conn) {
int32_t msgLen = transDumpFromBuffer(&conn->readBuf, (char**)&pHead, 0); int32_t msgLen = transDumpFromBuffer(&conn->readBuf, (char**)&pHead, 0);
if (msgLen < 0) { if (msgLen < 0) {
taosMemoryFree(pHead); taosMemoryFree(pHead);
tWarn("%s conn %p recv invalid packet ", CONN_GET_INST_LABEL(conn), conn); tWarn("%s conn %p recv invalid packet", CONN_GET_INST_LABEL(conn), conn);
// TODO: notify cb // TODO: notify cb
code = pThrd->notifyExceptCb(pThrd, NULL, NULL); code = pThrd->notifyExceptCb(pThrd, NULL, NULL);
if (code != 0) { if (code != 0) {
tError("%s conn %p failed to notify user since %s", tstrerror(code)); tError("%s conn %p failed to notify user since %s", CONN_GET_INST_LABEL(conn), conn, tstrerror(code));
} }
return; return;
} }
@ -894,7 +894,7 @@ static void cliRecvCb(uv_stream_t* handle, ssize_t nread, const uv_buf_t* buf) {
SCliConn* conn = handle->data; SCliConn* conn = handle->data;
code = transSetReadOption((uv_handle_t*)handle); code = transSetReadOption((uv_handle_t*)handle);
if (code != 0) { if (code != 0) {
tWarn("%s conn %p failed to set recv opt since %s", CONN_GET_INST_LABEL(conn), conn, code); tWarn("%s conn %p failed to set recv opt since %s", CONN_GET_INST_LABEL(conn), conn, tstrerror(code));
} }
SConnBuffer* pBuf = &conn->readBuf; SConnBuffer* pBuf = &conn->readBuf;
@ -1488,16 +1488,14 @@ void cliConnCb(uv_connect_t* req, int status) {
pConn->connnected = 1; pConn->connnected = 1;
code = cliConnSetSockInfo(pConn); code = cliConnSetSockInfo(pConn);
if (code != 0) { if (code != 0) {
tDebug("%s conn %p failed to get sock info,reason:%s ", CONN_GET_INST_LABEL(pConn), pConn, pConn->dstAddr, tDebug("%s conn %p failed to get sock info since %s", CONN_GET_INST_LABEL(pConn), pConn, tstrerror(code));
tstrerror(code));
TAOS_UNUSED(transUnrefCliHandle(pConn)); TAOS_UNUSED(transUnrefCliHandle(pConn));
} }
tTrace("%s conn %p connect to server successfully", CONN_GET_INST_LABEL(pConn), pConn); tTrace("%s conn %p connect to server successfully", CONN_GET_INST_LABEL(pConn), pConn);
code = cliBatchSend(pConn); code = cliBatchSend(pConn);
if (code != 0) { if (code != 0) {
tDebug("%s conn %p failed to get sock info,reason:%s ", CONN_GET_INST_LABEL(pConn), pConn, pConn->dstAddr, tDebug("%s conn %p failed to get sock info since %s", CONN_GET_INST_LABEL(pConn), pConn, tstrerror(code));
tstrerror(code));
TAOS_UNUSED(transUnrefCliHandle(pConn)); TAOS_UNUSED(transUnrefCliHandle(pConn));
} }
} }

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

@ -611,7 +611,7 @@ void uvOnRecvCb(uv_stream_t* cli, ssize_t nread, const uv_buf_t* buf) {
code = transSetReadOption((uv_handle_t*)cli); code = transSetReadOption((uv_handle_t*)cli);
if (code != 0) { if (code != 0) {
tWarn("%s conn %p failed to set recv opt since %s", transLabel(pInst), conn, code); tWarn("%s conn %p failed to set recv opt since %s", transLabel(pInst), conn, tstrerror(code));
} }
SConnBuffer* pBuf = &conn->readBuf; SConnBuffer* pBuf = &conn->readBuf;
@ -870,7 +870,7 @@ int32_t uvMayHandleReleaseResp(SSvrRespMsg* pMsg) {
transFreeMsg(p->msg.pCont); transFreeMsg(p->msg.pCont);
code = taosHashRemove(pConn->pQTable, &qid, sizeof(qid)); code = taosHashRemove(pConn->pQTable, &qid, sizeof(qid));
if (code != 0) { if (code != 0) {
tError("%s conn %p failed release qid:%d since %s", tstrerror(code)); tError("%s conn %p failed release qid:%d since %s", transLabel(pConn->pInst), pConn, tstrerror(code));
} }
} }
} }