From a93578f8ed64cc9f97ba8e1faacfc933396be906 Mon Sep 17 00:00:00 2001 From: Jake Shadle Date: Mon, 9 Dec 2024 13:41:14 +0100 Subject: [PATCH 1/3] Note difference of loop kind in shutdown message --- src/components/proxy/io_uring_shared.rs | 8 +++++++- 1 file changed, 7 insertions(+), 1 deletion(-) diff --git a/src/components/proxy/io_uring_shared.rs b/src/components/proxy/io_uring_shared.rs index 7593db7fd..d0871bfca 100644 --- a/src/components/proxy/io_uring_shared.rs +++ b/src/components/proxy/io_uring_shared.rs @@ -539,7 +539,13 @@ impl IoUringLoop { loop_ctx.enqueue_send(pending); } } else { - tracing::info!("io-uring loop shutdown requested"); + if matches!(ctx, PacketProcessorCtx::Router { .. }) { + tracing::info!( + "downstream io-uring loop shutdown requested" + ); + } else { + tracing::info!("session io-uring loop shutdown requested"); + } break 'io; } } From cf31ec6fc376e71b65f375b68548ee189bf06aa5 Mon Sep 17 00:00:00 2001 From: Jake Shadle Date: Mon, 9 Dec 2024 16:47:38 +0100 Subject: [PATCH 2/3] Add advisory ignore --- deny.toml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/deny.toml b/deny.toml index 0d4461fb2..0d4981760 100644 --- a/deny.toml +++ b/deny.toml @@ -23,7 +23,7 @@ targets = [ all-features = true [advisories] -ignore = ["RUSTSEC-2024-0384"] +ignore = ["RUSTSEC-2024-0384", { id = "RUSTSEC-2024-0421", reason = "transitive dependency, updated but not released https://github.com/hickory-dns/hickory-dns/pull/2564" }] [bans] deny = [ From d340503f4f6ee946c1adc9c857d9ed84d556eb9a Mon Sep 17 00:00:00 2001 From: Jake Shadle Date: Mon, 9 Dec 2024 16:49:37 +0100 Subject: [PATCH 3/3] Remove uring shutdown from session shutdown --- src/components/proxy/sessions.rs | 1 - 1 file changed, 1 deletion(-) diff --git a/src/components/proxy/sessions.rs b/src/components/proxy/sessions.rs index 0ee3a57dd..5a6f523f6 100644 --- a/src/components/proxy/sessions.rs +++ b/src/components/proxy/sessions.rs @@ -524,7 +524,6 @@ impl Session { self.active_session_metric().dec(); inner_metrics::duration_secs().observe(self.created_at.elapsed().as_secs() as f64); tracing::debug!(source = %self.key.source, dest_address = %self.key.dest, "Session closed"); - self.pending_sends.shutdown_receiver(); SessionPool::release_socket(self.pool.clone(), self.key, self.socket_port); } }