From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup 5/5] proxmox-backup-proxy: use only jobstate for garbage_collection schedule
Date: Mon, 2 Nov 2020 12:34:39 +0100 [thread overview]
Message-ID: <20201102113439.26618-6-d.csapak@proxmox.com> (raw)
In-Reply-To: <20201102113439.26618-1-d.csapak@proxmox.com>
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>
---
src/bin/proxmox-backup-proxy.rs | 21 +++++----------------
1 file changed, 5 insertions(+), 16 deletions(-)
diff --git a/src/bin/proxmox-backup-proxy.rs b/src/bin/proxmox-backup-proxy.rs
index 8d28aecb..bf121213 100644
--- a/src/bin/proxmox-backup-proxy.rs
+++ b/src/bin/proxmox-backup-proxy.rs
@@ -290,22 +290,11 @@ async fn schedule_datastore_garbage_collection() {
let worker_type = "garbage_collection";
- let stat = datastore.last_gc_status();
- 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,
- Err(err) => {
- eprintln!("could not get last run time of {} {}: {}", worker_type, store, err);
- continue;
- }
+ let last = match jobstate::last_run_time(worker_type, &store) {
+ Ok(time) => time,
+ Err(err) => {
+ eprintln!("could not get last run time of {} {}: {}", worker_type, store, err);
+ continue;
}
};
--
2.20.1
next prev parent reply other threads:[~2020-11-02 11:35 UTC|newest]
Thread overview: 11+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-11-02 11:34 [pbs-devel] [PATCH proxmox-backup 0/5] various bug fixes/improvements for gc Dominik Csapak
2020-11-02 11:34 ` [pbs-devel] [PATCH proxmox-backup 1/5] garbage collect: improve index error messages Dominik Csapak
2020-11-02 11:34 ` [pbs-devel] [PATCH proxmox-backup 2/5] backup/{dynamic, fixed}_index: improve error message for small index files Dominik Csapak
2020-11-02 11:34 ` [pbs-devel] [PATCH proxmox-backup 3/5] server/gc_job: add 'to_stdout' Dominik Csapak
2020-11-02 11:34 ` [pbs-devel] [PATCH proxmox-backup 4/5] api2/admin/datastore: start the garbage_collection task with our helper Dominik Csapak
2020-11-03 5:45 ` Dietmar Maurer
2020-11-03 6:54 ` Dominik Csapak
2020-11-02 11:34 ` Dominik Csapak [this message]
2020-11-02 20:12 ` [pbs-devel] applied: [PATCH proxmox-backup 0/5] various bug fixes/improvements for gc Thomas Lamprecht
2020-11-03 5:11 ` Dietmar Maurer
2020-11-03 7:14 ` Dominik Csapak
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=20201102113439.26618-6-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