From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 410F1655A4 for ; Tue, 3 Nov 2020 14:26:33 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2D8412CBE9 for ; Tue, 3 Nov 2020 14:26:03 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 9D2E12CBDC for ; Tue, 3 Nov 2020 14:26:02 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 6375D46017 for ; Tue, 3 Nov 2020 14:26:02 +0100 (CET) Date: Tue, 3 Nov 2020 14:25:21 +0100 (CET) From: Dietmar Maurer To: Wolfgang Bumiller Cc: pve-devel@lists.proxmox.com Message-ID: <780988344.703.1604409922324@webmail.proxmox.com> In-Reply-To: <20201103130552.dg4t2xaleylkzjq3@wobu-vie.proxmox.com> References: <20201103122636.2958-1-dietmar@proxmox.com> <20201103130552.dg4t2xaleylkzjq3@wobu-vie.proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-Priority: 3 Importance: Normal X-Mailer: Open-Xchange Mailer v7.10.4-Rev12 X-Originating-Client: open-xchange-appsuite X-SPAM-LEVEL: Spam detection results: 0 AWL 0.068 Adjusted score from AWL reputation of From: address KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [RFC PATCH] fix #3106: correctly queue incoming connections X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 03 Nov 2020 13:26:33 -0000 > > - 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... I have tried to do that for 2 hours, then gave up.... So please tell m e how to make that work! > > > > 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, > > +) -> tokio::sync::mpsc::Receiver, 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. yes > > > + > > + 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