From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup] server/prune_job: fix locking during prune jobs
Date: Wed, 2 Jun 2021 15:54:25 +0200 [thread overview]
Message-ID: <20210602135425.27990-1-d.csapak@proxmox.com> (raw)
removing the backup dir must acquire the snapshot lock, else it can
happen that we remove a snapshot while it is being restored
or backed up to tape
the original commit that adds the force flag
(c9756b40d1b33c573216f7c8eba209200c1d9bd5)
mentions that the prune checks itself if the snapshot is in use,
but i could not find such code, so simply set force to false
to avoid failing and aborting the prune job, warn if it could not
and continue
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/server/prune_job.rs | 10 +++++++++-
1 file changed, 9 insertions(+), 1 deletion(-)
diff --git a/src/server/prune_job.rs b/src/server/prune_job.rs
index 572f1b04..ac56d167 100644
--- a/src/server/prune_job.rs
+++ b/src/server/prune_job.rs
@@ -8,6 +8,7 @@ use crate::{
server::jobstate::Job,
server::WorkerTask,
task_log,
+ task_warn,
};
pub fn do_prune_job(
@@ -67,7 +68,14 @@ pub fn do_prune_job(
info.backup_dir.backup_time_string()
);
if !keep {
- datastore.remove_backup_dir(&info.backup_dir, true)?;
+ if let Err(err) = datastore.remove_backup_dir(&info.backup_dir, false) {
+ task_warn!(
+ worker,
+ "failed to remove dir {:?}: {}",
+ info.backup_dir.relative_path(),
+ err,
+ );
+ }
}
}
}
--
2.20.1
next reply other threads:[~2021-06-02 13:54 UTC|newest]
Thread overview: 2+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-06-02 13:54 Dominik Csapak [this message]
2021-06-02 15:09 ` [pbs-devel] applied: " Thomas Lamprecht
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=20210602135425.27990-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