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

proxmox-backup-proxy: use only jobstate for garbage_collection schedule

Browse Source 
in case the garbage_collection errors out, we never set the in-memory
state, so if it failed, the last 'good' starttime was considered
for the schedule

this could lead to the job running every minute instead of the
correct schedule

Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
This commit is contained in:
Dominik Csapak
2020-11-02 12:34:39 +01:00
committed by Thomas Lamprecht
parent 4fdf5ddf5b
commit b6ba5acd29
1 changed files with 5 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
src/bin/proxmox-backup-proxy.rs
View File

@ -295,23 +295,12 @@ async fn schedule_datastore_garbage_collection() {
let worker_type = "garbage_collection"; let worker_type = "garbage_collection";
let stat = datastore.last_gc_status(); let last = match jobstate::last_run_time(worker_type, &store) {
let last = if let Some(upid_str) = stat.upid {
match upid_str.parse::<UPID>() {
Ok(upid) => upid.starttime,
Err(err) => {
eprintln!("unable to parse upid '{}' - {}", upid_str, err);
continue;
}
}
} else {
match jobstate::last_run_time(worker_type, &store) {
Ok(time) => time, Ok(time) => time,
Err(err) => { Err(err) => {
eprintln!("could not get last run time of {} {}: {}", worker_type, store, err); eprintln!("could not get last run time of {} {}: {}", worker_type, store, err);
continue; continue;
} }
}
}; };
let next = match compute_next_event(&event, last, false) { let next = match compute_next_event(&event, last, false) {