From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup] tools/daemon: fix reload with open connections
Date: Wed, 4 Nov 2020 13:09:38 +0100 [thread overview]
Message-ID: <20201104120938.14885-1-d.csapak@proxmox.com> (raw)
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@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
next reply other threads:[~2020-11-04 12:10 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-04 12:09 Dominik Csapak [this message]
2020-11-05 10:15 ` [pbs-devel] applied: " 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=20201104120938.14885-1-d.csapak@proxmox.com \
--to=d.csapak@proxmox.com \
--cc=pbs-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 a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox