* [PATCH] [v2]lib/telemetry:fix telemetry conns leak in case of socket write fail
@ 2024-01-20 8:32 Shaowei Sun
0 siblings, 0 replies; 4+ messages in thread
From: Shaowei Sun @ 2024-01-20 8:32 UTC (permalink / raw)
To: dev; +Cc: ciara.power
Telemetry can only create 10 conns by default, each of which is processed
by a thread.
When a thread fails to write using socket, the thread will end directly
without reducing the total number of conns.
This will result in the machine running for a long time, and if there are
10 failures, the telemetry will be unavailable
Fixes: 6dd571fd07c3 ("telemetry: introduce new functionality")
Signed-off-by: Shaowei Sun <1819846787@qq.com>
---
lib/telemetry/telemetry.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
index 31e2391867..0b00c04090 100644
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -378,8 +378,8 @@ client_handler(void *sock_id)
"{\"version\":\"%s\",\"pid\":%d,\"max_output_len\":%d}",
telemetry_version, getpid(), MAX_OUTPUT_LEN);
if (write(s, info_str, strlen(info_str)) < 0) {
- close(s);
- return NULL;
+ TMTY_LOG_LINE(ERR, "Socket write base info to client failed");
+ goto exit;
}
/* receive data is not null terminated */
@@ -404,6 +404,7 @@ client_handler(void *sock_id)
bytes = read(s, buffer, sizeof(buffer) - 1);
}
+exit:
close(s);
rte_atomic_fetch_sub_explicit(&v2_clients, 1, rte_memory_order_relaxed);
return NULL;
--
2.37.1 (Apple Git-137.1)
^ permalink raw reply [flat|nested] 4+ messages in thread
* Re: [PATCH] [v2]lib/telemetry:fix telemetry conns leak in case of socket write fail
2024-01-20 8:58 ` [PATCH] [v2]lib/telemetry:fix " Shaowei Sun
@ 2024-01-22 7:39 ` fengchengwen
0 siblings, 0 replies; 4+ messages in thread
From: fengchengwen @ 2024-01-22 7:39 UTC (permalink / raw)
To: Shaowei Sun, dev; +Cc: ciara.power
Acked-by: Chengwen Feng <fengchengwen@huawei.com>
On 2024/1/20 16:58, Shaowei Sun wrote:
> Telemetry can only create 10 conns by default, each of which is processed
> by a thread.
>
> When a thread fails to write using socket, the thread will end directly
> without reducing the total number of conns.
>
> This will result in the machine running for a long time, and if there are
> 10 failures, the telemetry will be unavailable
>
> Fixes: 6dd571fd07c3 ("telemetry: introduce new functionality")
>
> Signed-off-by: Shaowei Sun <1819846787@qq.com>
> ---
> lib/telemetry/telemetry.c | 5 +++--
> 1 file changed, 3 insertions(+), 2 deletions(-)
>
> diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
> index 31e2391867..0b00c04090 100644
> --- a/lib/telemetry/telemetry.c
> +++ b/lib/telemetry/telemetry.c
> @@ -378,8 +378,8 @@ client_handler(void *sock_id)
> "{\"version\":\"%s\",\"pid\":%d,\"max_output_len\":%d}",
> telemetry_version, getpid(), MAX_OUTPUT_LEN);
> if (write(s, info_str, strlen(info_str)) < 0) {
> - close(s);
> - return NULL;
> + TMTY_LOG_LINE(ERR, "Socket write base info to client failed");
> + goto exit;
> }
>
> /* receive data is not null terminated */
> @@ -404,6 +404,7 @@ client_handler(void *sock_id)
>
> bytes = read(s, buffer, sizeof(buffer) - 1);
> }
> +exit:
> close(s);
> rte_atomic_fetch_sub_explicit(&v2_clients, 1, rte_memory_order_relaxed);
> return NULL;
>
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] [v2]lib/telemetry:fix telemetry conns leak in case of socket write fail
2024-01-19 11:40 [PATCH] lib/telemetry:fix " sunshaowei01
@ 2024-01-20 8:58 ` Shaowei Sun
2024-01-22 7:39 ` fengchengwen
0 siblings, 1 reply; 4+ messages in thread
From: Shaowei Sun @ 2024-01-20 8:58 UTC (permalink / raw)
To: dev; +Cc: ciara.power
Telemetry can only create 10 conns by default, each of which is processed
by a thread.
When a thread fails to write using socket, the thread will end directly
without reducing the total number of conns.
This will result in the machine running for a long time, and if there are
10 failures, the telemetry will be unavailable
Fixes: 6dd571fd07c3 ("telemetry: introduce new functionality")
Signed-off-by: Shaowei Sun <1819846787@qq.com>
---
lib/telemetry/telemetry.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
index 31e2391867..0b00c04090 100644
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -378,8 +378,8 @@ client_handler(void *sock_id)
"{\"version\":\"%s\",\"pid\":%d,\"max_output_len\":%d}",
telemetry_version, getpid(), MAX_OUTPUT_LEN);
if (write(s, info_str, strlen(info_str)) < 0) {
- close(s);
- return NULL;
+ TMTY_LOG_LINE(ERR, "Socket write base info to client failed");
+ goto exit;
}
/* receive data is not null terminated */
@@ -404,6 +404,7 @@ client_handler(void *sock_id)
bytes = read(s, buffer, sizeof(buffer) - 1);
}
+exit:
close(s);
rte_atomic_fetch_sub_explicit(&v2_clients, 1, rte_memory_order_relaxed);
return NULL;
--
2.37.1 (Apple Git-137.1)
^ permalink raw reply [flat|nested] 4+ messages in thread
* [PATCH] [v2]lib/telemetry:fix telemetry conns leak in case of socket write fail
@ 2024-01-20 8:50 Shaowei Sun
0 siblings, 0 replies; 4+ messages in thread
From: Shaowei Sun @ 2024-01-20 8:50 UTC (permalink / raw)
To: dev; +Cc: ciara.power
Telemetry can only create 10 conns by default, each of which is processed
by a thread.
When a thread fails to write using socket, the thread will end directly
without reducing the total number of conns.
This will result in the machine running for a long time, and if there are
10 failures, the telemetry will be unavailable
Fixes: 6dd571fd07c3 ("telemetry: introduce new functionality")
Signed-off-by: Shaowei Sun <1819846787@qq.com>
---
lib/telemetry/telemetry.c | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/lib/telemetry/telemetry.c b/lib/telemetry/telemetry.c
index 31e2391867..0b00c04090 100644
--- a/lib/telemetry/telemetry.c
+++ b/lib/telemetry/telemetry.c
@@ -378,8 +378,8 @@ client_handler(void *sock_id)
"{\"version\":\"%s\",\"pid\":%d,\"max_output_len\":%d}",
telemetry_version, getpid(), MAX_OUTPUT_LEN);
if (write(s, info_str, strlen(info_str)) < 0) {
- close(s);
- return NULL;
+ TMTY_LOG_LINE(ERR, "Socket write base info to client failed");
+ goto exit;
}
/* receive data is not null terminated */
@@ -404,6 +404,7 @@ client_handler(void *sock_id)
bytes = read(s, buffer, sizeof(buffer) - 1);
}
+exit:
close(s);
rte_atomic_fetch_sub_explicit(&v2_clients, 1, rte_memory_order_relaxed);
return NULL;
--
2.37.1 (Apple Git-137.1)
^ permalink raw reply [flat|nested] 4+ messages in thread
end of thread, other threads:[~2024-01-22 7:39 UTC | newest]
Thread overview: 4+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2024-01-20 8:32 [PATCH] [v2]lib/telemetry:fix telemetry conns leak in case of socket write fail Shaowei Sun
-- strict thread matches above, loose matches on Subject: below --
2024-01-20 8:50 Shaowei Sun
2024-01-19 11:40 [PATCH] lib/telemetry:fix " sunshaowei01
2024-01-20 8:58 ` [PATCH] [v2]lib/telemetry:fix " Shaowei Sun
2024-01-22 7:39 ` fengchengwen
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).