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-16 16:36:51 +08:00
parent bbb3d4cc61
commit 1a70cc243a
1 changed files with 1 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -377,11 +377,6 @@ void cliConnMaySetReadTimeout(SCliConn* conn, int timeout) {
cliConnCheckTimoutMsg(conn); cliConnCheckTimoutMsg(conn);
if (conn->timer != NULL) {
// reset previous timer
cliResetConnTimer(conn);
}
if (conn->timer == NULL) { if (conn->timer == NULL) {
if (cliGetConnTimer(conn->hostThrd, conn) != 0) { if (cliGetConnTimer(conn->hostThrd, conn) != 0) {
return; return;
@ -634,7 +629,7 @@ void cliConnTimeout(uv_timer_t* handle) {
bool filterToRmTimoutReq(void* key, void* arg) { bool filterToRmTimoutReq(void* key, void* arg) {
SCliReq* pReq = QUEUE_DATA(key, SCliReq, q); SCliReq* pReq = QUEUE_DATA(key, SCliReq, q);
if (pReq->msg.info.qId == 0 && REQUEST_NO_RESP(&pReq->msg)) { if (pReq->msg.info.qId == 0 && !REQUEST_NO_RESP(&pReq->msg) && pReq->ctx) {
int64_t elapse = ((taosGetTimestampUs() - pReq->st) / 1000); int64_t elapse = ((taosGetTimestampUs() - pReq->st) / 1000);
if (elapse > READ_TIMEOUT) { if (elapse > READ_TIMEOUT) {
return true; return true;