[pbs-devel] applied: [PATCH proxmox-backup] tools/daemon: fix reload with open connections
Wolfgang Bumiller
w.bumiller at proxmox.com
Thu Nov 5 11:15:29 CET 2020
applied
On Wed, Nov 04, 2020 at 01:09:38PM +0100, Dominik Csapak wrote:
> instead of await'ing the result of 'create_service' directly,
> poll it together with the shutdown_future
>
> if we reached that, fork_restart the new daemon, and await
> the open future from 'create_service'
>
> this way the old process still handles open connections until they finish,
> while we already start a new process that handles new incoming connections
>
> Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
> ---
> src/tools/daemon.rs | 20 +++++++++++++++++---
> 1 file changed, 17 insertions(+), 3 deletions(-)
>
> diff --git a/src/tools/daemon.rs b/src/tools/daemon.rs
> index f4f63e7f..249ce2ad 100644
> --- a/src/tools/daemon.rs
> +++ b/src/tools/daemon.rs
> @@ -12,6 +12,7 @@ use std::task::{Context, Poll};
> use std::path::PathBuf;
>
> use anyhow::{bail, format_err, Error};
> +use futures::future::{self, Either};
>
> use proxmox::tools::io::{ReadExt, WriteExt};
>
> @@ -262,7 +263,7 @@ pub async fn create_daemon<F, S>(
> ) -> Result<(), Error>
> where
> F: FnOnce(tokio::net::TcpListener, NotifyReady) -> Result<S, Error>,
> - S: Future<Output = ()>,
> + S: Future<Output = ()> + Unpin,
> {
> let mut reloader = Reloader::new()?;
>
> @@ -271,11 +272,19 @@ where
> move || async move { Ok(tokio::net::TcpListener::bind(&address).await?) },
> ).await?;
>
> - create_service(listener, NotifyReady)?.await;
> + let server_future = create_service(listener, NotifyReady)?;
> + let shutdown_future = server::shutdown_future();
> +
> + let finish_future = match future::select(server_future, shutdown_future).await {
> + Either::Left((_, _)) => {
> + crate::tools::request_shutdown(); // make sure we are in shutdown mode
> + None
> + }
> + Either::Right((_, server_future)) => Some(server_future),
> + };
>
> let mut reloader = Some(reloader);
>
> - crate::tools::request_shutdown(); // make sure we are in shutdown mode
> if server::is_reload_request() {
> log::info!("daemon reload...");
> if let Err(e) = systemd_notify(SystemdNotify::Reloading) {
> @@ -288,6 +297,11 @@ where
> } else {
> log::info!("daemon shutting down...");
> }
> +
> + if let Some(future) = finish_future {
> + future.await;
> + }
> + log::info!("daemon shut down...");
> Ok(())
> }
>
> --
> 2.20.1
More information about the pbs-devel
mailing list