tyler/proxmox-backup
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

rest: daemon: sd notify barrier: allow caller to set timeout

Browse Source 
else it's rather to subtle and not a nice interface considering that
we only want to have a thin wrapper for sd_notify_barrier..

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>
This commit is contained in:
Thomas Lamprecht 2021-10-01 15:27:46 +02:00
parent 9a1330c72e
commit 058b4b9708
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
proxmox-rest-server/src/daemon.rs
View File

@ -188,7 +188,7 @@ impl Reloader {
} }
// ensure systemd got the message about the new main PID before continuing, else it // ensure systemd got the message about the new main PID before continuing, else it
// will get confused if the new main process sends its READY signal before that // will get confused if the new main process sends its READY signal before that
if let Err(e) = systemd_notify_barrier() { if let Err(e) = systemd_notify_barrier(u64::MAX) {
log::error!("failed to wait on systemd-processing: {}", e); log::error!("failed to wait on systemd-processing: {}", e);
} }
@ -293,7 +293,7 @@ where
if let Err(e) = systemd_notify(SystemdNotify::Reloading) { if let Err(e) = systemd_notify(SystemdNotify::Reloading) {
log::error!("failed to notify systemd about the state change: {}", e); log::error!("failed to notify systemd about the state change: {}", e);
} }
if let Err(e) = systemd_notify_barrier() { if let Err(e) = systemd_notify_barrier(u64::MAX) {
log::error!("failed to wait on systemd-processing: {}", e); log::error!("failed to wait on systemd-processing: {}", e);
} }
@ -329,8 +329,8 @@ pub enum SystemdNotify {
} }
/// Waits until all previously sent messages with sd_notify are processed /// Waits until all previously sent messages with sd_notify are processed
pub fn systemd_notify_barrier() -> Result<(), Error> { pub fn systemd_notify_barrier(timeout: u64) -> Result<(), Error> {
let rc = unsafe { sd_notify_barrier(0, u64::MAX) }; // infinite timeout let rc = unsafe { sd_notify_barrier(0, timeout) };
if rc < 0 { if rc < 0 {
bail!( bail!(
"systemd_notify_barrier failed: {}", "systemd_notify_barrier failed: {}",