[pbs-devel] [PATCH] proxmox-backup-proxy: stop accept() loop on daemon shutdown
Dominik Csapak
d.csapak at proxmox.com
Fri Apr 29 11:20:17 CEST 2022
When a task was running during a reload, the old process would still
accept connections, but drop them due to the closed receiving channel.
This resulted in sporadic connection failures in such a scenario,
depending on which process got the connection.
To fix that poll the shutdown_future too during accept, and exit the
loop then.
Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
src/bin/proxmox-backup-proxy.rs | 15 +++++++++------
1 file changed, 9 insertions(+), 6 deletions(-)
diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs
index 744a93f9..b2badfa6 100644
--- a/src/bin/proxmox-backup-proxy.rs
+++ b/src/bin/proxmox-backup-proxy.rs
@@ -396,12 +396,15 @@ async fn accept_connection(
let accept_counter = Arc::new(());
loop {
- let (sock, peer) = match listener.accept().await {
- Ok(conn) => conn,
- Err(err) => {
- eprintln!("error accepting tcp connection: {}", err);
- continue;
- }
+ let (sock, peer) = select! {
+ res = listener.accept().fuse() => match res {
+ Ok(conn) => conn,
+ Err(err) => {
+ eprintln!("error accepting tcp connection: {}", err);
+ continue;
+ }
+ },
+ _ = proxmox_rest_server::shutdown_future().fuse() => break,
};
sock.set_nodelay(true).unwrap();
--
2.30.2
More information about the pbs-devel
mailing list