From a8d7033cb276aaaf81fdf2130c92c8f88b88387e Mon Sep 17 00:00:00 2001 From: Dietmar Maurer Date: Fri, 29 May 2020 07:59:42 +0200 Subject: [PATCH] src/bin/proxmox-backup-proxy.rs: add test if last prune job is still running --- src/bin/proxmox-backup-proxy.rs | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs index 2830c046..9a60e9ea 100644 --- a/src/bin/proxmox-backup-proxy.rs +++ b/src/bin/proxmox-backup-proxy.rs @@ -385,12 +385,15 @@ async fn schedule_datastore_prune() { } }; - //fixme: if last_prune_job_stzill_running { continue; } - let worker_type = "prune"; let last = match lookup_last_worker(worker_type, &store) { - Ok(Some(upid)) => upid.starttime, + Ok(Some(upid)) => { + if proxmox_backup::server::worker_is_active_local(&upid) { + continue; + } + upid.starttime + } Ok(None) => 0, Err(err) => { eprintln!("lookup_last_job_start failed: {}", err);