proxmox-mirrors/proxmox-backup
1
0
Fork 1
mirror of https://git.proxmox.com/git/proxmox-backup synced 2025-08-15 04:51:00 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

verify/protect: improve error on disappearing snapshots

Browse Source 
or clients passing in a non-existent snapshot.

Signed-off-by: Fabian Grünbichler <f.gruenbichler@proxmox.com>
This commit is contained in:
Fabian Grünbichler 2023-02-02 14:04:24 +01:00 committed by Wolfgang Bumiller
parent 07b6db8099
commit c78437e320
2 changed files with 14 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pbs-datastore/src/datastore.rs
View File

@ -1180,6 +1180,10 @@ impl DataStore {
pub fn update_protection(&self, backup_dir: &BackupDir, protection: bool) -> Result<(), Error> { pub fn update_protection(&self, backup_dir: &BackupDir, protection: bool) -> Result<(), Error> {
let full_path = backup_dir.full_path(); let full_path = backup_dir.full_path();
if !full_path.exists() {
bail!("snapshot {} does not exist!", backup_dir.dir());
}
let _guard = lock_dir_noblock(&full_path, "snapshot", "possibly running or in use")?; let _guard = lock_dir_noblock(&full_path, "snapshot", "possibly running or in use")?;
let protected_path = backup_dir.protected_file(); let protected_path = backup_dir.protected_file();

10
src/backup/verify.rs
View File

@ -328,6 +328,16 @@ pub fn verify_backup_dir(
upid: UPID, upid: UPID,
filter: Option<&dyn Fn(&BackupManifest) -> bool>, filter: Option<&dyn Fn(&BackupManifest) -> bool>,
) -> Result<bool, Error> { ) -> Result<bool, Error> {
if !backup_dir.full_path().exists() {
task_log!(
verify_worker.worker,
"SKIPPED: verify {}:{} - snapshot does not exist (anymore).",
verify_worker.datastore.name(),
backup_dir.dir(),
);
return Ok(true);
}
let snap_lock = lock_dir_noblock_shared( let snap_lock = lock_dir_noblock_shared(
&backup_dir.full_path(), &backup_dir.full_path(),
"snapshot", "snapshot",