From 8838ea4d38c0c7e9e2ba134ae91b6438c191eba6 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 21 Nov 2024 18:15:26 +0800 Subject: [PATCH 1/4] fix conn timeout --- source/libs/transport/inc/transComm.h | 2 +- source/libs/transport/src/transCli.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/source/libs/transport/inc/transComm.h b/source/libs/transport/inc/transComm.h index 5c79b379ed..bc682eca4c 100644 --- a/source/libs/transport/inc/transComm.h +++ b/source/libs/transport/inc/transComm.h @@ -96,7 +96,7 @@ typedef void* queue[2]; // #define TRANS_RETRY_COUNT_LIMIT 100 // retry count limit // #define TRANS_RETRY_INTERVAL 15 // retry interval (ms) -#define TRANS_CONN_TIMEOUT 3000 // connect timeout (ms) +#define TRANS_CONN_TIMEOUT 5000 // connect timeout (ms) #define TRANS_READ_TIMEOUT 3000 // read timeout (ms) #define TRANS_PACKET_LIMIT 1024 * 1024 * 512 diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c index c03d3418fa..27f84640fb 100644 --- a/source/libs/transport/src/transCli.c +++ b/source/libs/transport/src/transCli.c @@ -725,6 +725,7 @@ void cliConnTimeout(uv_timer_t* handle) { return; } + cliMayUpdateFqdnCache(pThrd->fqdn2ipCache, conn->dstAddr); tTrace("%s conn %p conn timeout", CONN_GET_INST_LABEL(conn), conn); TAOS_UNUSED(transUnrefCliHandle(conn)); } From af149f41eda9096330568cd753059f97f9c2f5c7 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 21 Nov 2024 18:26:18 +0800 Subject: [PATCH 2/4] fix conn timeout --- source/libs/transport/src/transCli.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c index 27f84640fb..2a2d5076e2 100644 --- a/source/libs/transport/src/transCli.c +++ b/source/libs/transport/src/transCli.c @@ -726,7 +726,7 @@ void cliConnTimeout(uv_timer_t* handle) { } cliMayUpdateFqdnCache(pThrd->fqdn2ipCache, conn->dstAddr); - tTrace("%s conn %p conn timeout", CONN_GET_INST_LABEL(conn), conn); + tTrace("%s conn %p failed to %s since conn timeout", CONN_GET_INST_LABEL(conn), conn->dstAddr, conn); TAOS_UNUSED(transUnrefCliHandle(conn)); } From 72b95fa3165a6555807ef270bf821b436379f956 Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Thu, 21 Nov 2024 19:48:15 +0800 Subject: [PATCH 3/4] fix compile error --- source/libs/transport/src/transCli.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c index 2a2d5076e2..4b29ace8c3 100644 --- a/source/libs/transport/src/transCli.c +++ b/source/libs/transport/src/transCli.c @@ -726,7 +726,7 @@ void cliConnTimeout(uv_timer_t* handle) { } cliMayUpdateFqdnCache(pThrd->fqdn2ipCache, conn->dstAddr); - tTrace("%s conn %p failed to %s since conn timeout", CONN_GET_INST_LABEL(conn), conn->dstAddr, conn); + tTrace("%s conn %p failed to connect %s since conn timeout", CONN_GET_INST_LABEL(conn), conn, conn->dstAddr, conn); TAOS_UNUSED(transUnrefCliHandle(conn)); } From 59b63d5642d60629928c740c69d2f165ae80a06e Mon Sep 17 00:00:00 2001 From: yihaoDeng Date: Fri, 22 Nov 2024 08:26:07 +0800 Subject: [PATCH 4/4] fix conn timeout --- source/libs/transport/src/transCli.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/source/libs/transport/src/transCli.c b/source/libs/transport/src/transCli.c index 4b29ace8c3..5bd6d244a4 100644 --- a/source/libs/transport/src/transCli.c +++ b/source/libs/transport/src/transCli.c @@ -726,7 +726,7 @@ void cliConnTimeout(uv_timer_t* handle) { } cliMayUpdateFqdnCache(pThrd->fqdn2ipCache, conn->dstAddr); - tTrace("%s conn %p failed to connect %s since conn timeout", CONN_GET_INST_LABEL(conn), conn, conn->dstAddr, conn); + tTrace("%s conn %p failed to connect %s since conn timeout", CONN_GET_INST_LABEL(conn), conn, conn->dstAddr); TAOS_UNUSED(transUnrefCliHandle(conn)); }