From 6b3b67ff468876d7dddd7ccc08701b5a2464fcf8 Mon Sep 17 00:00:00 2001 From: Wesley Pettit Date: Tue, 11 Apr 2023 15:17:49 -0700 Subject: [PATCH] upstream: always remove keepalive close event on shutdown if registered Resolves this issue: https://github.com/fluent/fluent-bit/issues/6821 Signed-off-by: Wesley Pettit --- src/flb_upstream.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/flb_upstream.c b/src/flb_upstream.c index dd16c3edb8a..e6dc6330cc5 100644 --- a/src/flb_upstream.c +++ b/src/flb_upstream.c @@ -442,7 +442,7 @@ static int prepare_destroy_conn(struct flb_upstream_conn *u_conn) flb_trace("[upstream] destroy connection #%i to %s:%i", u_conn->fd, u->tcp_host, u->tcp_port); - if (u->flags & FLB_IO_ASYNC || u_conn->ka_dropped_event_added == FLB_TRUE) { + if (MK_EVENT_IS_REGISTERED((&u_conn->event))) { mk_event_del(u_conn->evl, &u_conn->event); }