From: Dietmar Maurer <dietmar@proxmox.com>
To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>,
Wolfgang Bumiller <w.bumiller@proxmox.com>
Subject: Re: [pbs-devel] [PATCH backup 5/7] proxy: implement 'reload-certificate' command
Date: Wed, 12 May 2021 09:42:45 +0200 (CEST) [thread overview]
Message-ID: <2006574301.2110.1620805365548@webmail.proxmox.com> (raw)
Stupid questzioon, but why cant we do:
diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs
index fc773459..29298a22 100644
--- a/src/bin/proxmox-backup-proxy.rs
+++ b/src/bin/proxmox-backup-proxy.rs
@@ -223,7 +223,6 @@ async fn accept_connection(
// Note that these must not be moved out/modified directly, they get pinned in the loop and
// "rearmed" after waking up:
let mut reload_tls = notify_tls_cert_reload.notified();
- let mut accept = listener.accept();
loop {
let sock;
@@ -231,7 +230,9 @@ async fn accept_connection(
// normally we'd use `tokio::pin!()` but we need this to happen outside the loop and we
// need to be able to "rearm" the futures:
let reload_tls_pin = unsafe { Pin::new_unchecked(&mut reload_tls) };
- let accept_pin = unsafe { Pin::new_unchecked(&mut accept) };
+ //let accept_pin = unsafe { Pin::new_unchecked(&mut accept) };
+ let accept = listener.accept();
+
tokio::select! {
_ = reload_tls_pin => {
// rearm the notification:
@@ -244,14 +245,14 @@ async fn accept_connection(
}
continue;
}
- res = accept_pin => match res {
+ res = accept => match res {
Err(err) => {
eprintln!("error accepting tcp connection: {}", err);
continue;
}
Ok((new_sock, _addr)) => {
// rearm the accept future:
- accept = listener.accept();
+ //accept = listener.accept();
sock = new_sock;
}
> async fn accept_connection(
> listener: tokio::net::TcpListener,
> - acceptor: Arc<openssl::ssl::SslAcceptor>,
> + mut acceptor: Arc<openssl::ssl::SslAcceptor>,
> debug: bool,
> sender: tokio::sync::mpsc::Sender<ClientStreamResult>,
> + notify_tls_cert_reload: Arc<tokio::sync::Notify>,
> ) {
> let accept_counter = Arc::new(());
>
> + // Note that these must not be moved out/modified directly, they get pinned in the loop and
> + // "rearmed" after waking up:
> + let mut reload_tls = notify_tls_cert_reload.notified();
> + let mut accept = listener.accept();
> +
> loop {
> - let (sock, _addr) = match listener.accept().await {
> - Ok(conn) => conn,
> - Err(err) => {
> - eprintln!("error accepting tcp connection: {}", err);
> + let sock;
> +
> + // normally we'd use `tokio::pin!()` but we need this to happen outside the loop and we
> + // need to be able to "rearm" the futures:
> + let reload_tls_pin = unsafe { Pin::new_unchecked(&mut reload_tls) };
> + let accept_pin = unsafe { Pin::new_unchecked(&mut accept) };
> + tokio::select! {
> + _ = reload_tls_pin => {
> + // rearm the notification:
> + reload_tls = notify_tls_cert_reload.notified();
> +
> + log::info!("reloading certificate");
> + match make_tls_acceptor() {
> + Err(err) => eprintln!("error reloading certificate: {}", err),
> + Ok(new_acceptor) => acceptor = new_acceptor,
> + }
> continue;
> }
> + res = accept_pin => match res {
> + Err(err) => {
> + eprintln!("error accepting tcp connection: {}", err);
> + continue;
> + }
> + Ok((new_sock, _addr)) => {
> + // rearm the accept future:
> + accept = listener.accept();
> +
> + sock = new_sock;
> + }
> + }
> };
>
> sock.set_nodelay(true).unwrap();
> --
> 2.20.1
>
>
>
> _______________________________________________
> pbs-devel mailing list
> pbs-devel@lists.proxmox.com
> https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel
next reply other threads:[~2021-05-12 7:43 UTC|newest]
Thread overview: 7+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-05-12 7:42 Dietmar Maurer [this message]
-- strict thread matches above, loose matches on Subject: below --
2021-05-12 9:17 Wolfgang Bumiller
2021-05-12 9:13 Dietmar Maurer
2021-05-12 9:01 Wolfgang Bumiller
2021-05-12 8:37 Dietmar Maurer
2021-05-12 8:00 Wolfgang Bumiller
2021-05-11 13:53 [pbs-devel] [PATCH backup 0/7] hot-reload proxy certificates Wolfgang Bumiller
2021-05-11 13:53 ` [pbs-devel] [PATCH backup 5/7] proxy: implement 'reload-certificate' command Wolfgang Bumiller
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=2006574301.2110.1620805365548@webmail.proxmox.com \
--to=dietmar@proxmox.com \
--cc=pbs-devel@lists.proxmox.com \
--cc=w.bumiller@proxmox.com \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox