From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Dietmar Maurer <dietmar@proxmox.com>
Cc: pve-devel@lists.proxmox.com
Subject: Re: [pve-devel] [RFC PATCH] fix #3106: correctly queue incoming connections
Date: Tue, 3 Nov 2020 14:05:52 +0100 [thread overview]
Message-ID: <20201103130552.dg4t2xaleylkzjq3@wobu-vie.proxmox.com> (raw)
In-Reply-To: <20201103122636.2958-1-dietmar@proxmox.com>
generally ACKed, but I have some notes:
On Tue, Nov 03, 2020 at 01:26:36PM +0100, Dietmar Maurer wrote:
> ---
>
> based, on Domink's patch, but with the following changes:
>
> - factor out code into separate function accept_connections()
> - no select with shutdown future (no needed)
> - remove sender2.send_timeout() - not sure why this was there?
> - restict number of spawned tasks
>
> Seems to work, but I get many handshake errors when connetion
> with the GUI:
>
> > https handshake failed - the handshake failed: unexpected EOF
>
> This is because of pve status ping (Thomas will fix that in pve)
>
> But I am not sure why I get the following?
>
> > https handshakeX failed - the handshake failed: error:14094416:SSL routines:ssl3_read_bytes:sslv3 alert certificate unknown:../ssl/record/rec_layer_s3.c:1544:SSL alert number 46
>
>
> src/bin/proxmox-backup-proxy.rs | 81 ++++++++++++++++++++++++++-------
> 1 file changed, 64 insertions(+), 17 deletions(-)
>
> diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs
> index 78ea4d53..1f0c16b4 100644
> --- a/src/bin/proxmox-backup-proxy.rs
> +++ b/src/bin/proxmox-backup-proxy.rs
> @@ -1,4 +1,4 @@
> -use std::sync::{Arc};
> +use std::sync::{Arc, atomic::{AtomicUsize, Ordering}};
> use std::path::{Path, PathBuf};
> use std::os::unix::io::AsRawFd;
>
> @@ -116,25 +116,12 @@ async fn run() -> Result<(), Error> {
> let server = daemon::create_daemon(
> ([0,0,0,0,0,0,0,0], 8007).into(),
> |listener, ready| {
> - let connections = proxmox_backup::tools::async_io::StaticIncoming::from(listener)
> - .map_err(Error::from)
> - .try_filter_map(move |(sock, _addr)| {
> - let acceptor = Arc::clone(&acceptor);
> - async move {
> - sock.set_nodelay(true).unwrap();
> -
> - let _ = set_tcp_keepalive(sock.as_raw_fd(), PROXMOX_BACKUP_TCP_KEEPALIVE_TIME);
>
> - Ok(tokio_openssl::accept(&acceptor, sock)
> - .await
> - .ok() // handshake errors aren't be fatal, so return None to filter
> - )
> - }
> - });
> - let connections = proxmox_backup::tools::async_io::HyperAccept(connections);
> + let connections = accept_connections(listener, acceptor);
> + let connections = hyper::server::accept::from_stream(connections);
If we move the `from_stream` into the function below...
>
> Ok(ready
> - .and_then(|_| hyper::Server::builder(connections)
> + .and_then(|_| hyper::Server::builder(connections)
> .serve(rest_server)
> .with_graceful_shutdown(server::shutdown_future())
> .map_err(Error::from)
> @@ -170,6 +157,66 @@ async fn run() -> Result<(), Error> {
> Ok(())
> }
>
> +fn accept_connections(
> + mut listener: tokio::net::TcpListener,
> + acceptor: Arc<openssl::ssl::SslAcceptor>,
> +) -> tokio::sync::mpsc::Receiver<Result<tokio_openssl::SslStream<tokio::net::TcpStream>, Error>> {
... then this could probably be shortened to
) -> impl Accept {
shortens the line by 80 ;-)
> +
> + let (sender, receiver) = tokio::sync::mpsc::channel(100);
> +
> + let accept_counter = Arc::new(AtomicUsize::new(0));
> +
> + const MAX_PENDING_ACCEPTS: usize = 100;
> +
> + tokio::spawn(async move {
> + loop {
> + match listener.accept().await {
> + Err(err) => {
> + eprintln!("error accepting tcp connection: {}", err);
> + }
> + Ok((sock, _addr)) => {
> + sock.set_nodelay(true).unwrap();
> + let _ = set_tcp_keepalive(sock.as_raw_fd(), PROXMOX_BACKUP_TCP_KEEPALIVE_TIME);
> + let acceptor = Arc::clone(&acceptor);
> + let mut sender = sender.clone();
> +
> + if accept_counter.load(Ordering::SeqCst) > MAX_PENDING_ACCEPTS {
> + eprintln!("connection rejected - to many open connections");
> + continue;
> + }
> + accept_counter.fetch_add(1, Ordering::SeqCst);
We should think about making a counter guard for this sort of thing,
because from this point onward we're not allowed to use `?` anywhere,
which is quite annoying.
> +
> + let accept_counter = accept_counter.clone();
> + tokio::spawn(async move {
> + let accept_future = tokio::time::timeout(
> + Duration::new(10, 0), tokio_openssl::accept(&acceptor, sock));
> +
> + let result = accept_future.await;
> +
> + match result {
> + Ok(Ok(connection)) => {
> + if let Err(_) = sender.send(Ok(connection)).await {
> + eprintln!("detect closed connection channel");
> + }
> + }
> + Ok(Err(err)) => {
> + eprintln!("https handshakeX failed - {}", err);
> + }
> + Err(_) => {
> + eprintln!("https handshake timeout");
> + }
> + }
which is why I'd rather thave the part above in its own `async fn`
followed by the `fetch_sub` below, followed by the `eprintln!()`s.
> +
> + accept_counter.fetch_sub(1, Ordering::SeqCst);
> + });
> + }
> + }
> + }
> + });
> +
> + receiver
> +}
> +
> fn start_stat_generator() {
> let abort_future = server::shutdown_future();
> let future = Box::pin(run_stat_generator());
> --
> 2.20.1
next prev parent reply other threads:[~2020-11-03 13:05 UTC|newest]
Thread overview: 8+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-03 12:26 Dietmar Maurer
2020-11-03 12:51 ` Dominik Csapak
2020-11-03 13:05 ` Wolfgang Bumiller [this message]
2020-11-03 13:25 ` Dietmar Maurer
2020-11-03 14:15 ` Wolfgang Bumiller
2020-11-03 15:54 ` Dietmar Maurer
2020-11-03 17:45 ` Dietmar Maurer
2020-11-04 5:37 ` Dietmar Maurer
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=20201103130552.dg4t2xaleylkzjq3@wobu-vie.proxmox.com \
--to=w.bumiller@proxmox.com \
--cc=dietmar@proxmox.com \
--cc=pve-devel@lists.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 an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.