[pbs-devel] [PATCH proxmox-backup v2 05/13] backup/datastore: prevent protected snapshots to be removed
Dominik Csapak
d.csapak at proxmox.com
Thu Sep 23 13:37:31 CEST 2021
by throwing an error for remove_backup_dir, and skipping for
remove_backup_group
Signed-off-by: Dominik Csapak <d.csapak at proxmox.com>
---
src/backup/datastore.rs | 37 +++++++++++++++++++++++++------------
1 file changed, 25 insertions(+), 12 deletions(-)
diff --git a/src/backup/datastore.rs b/src/backup/datastore.rs
index df8d46b6..a791807f 100644
--- a/src/backup/datastore.rs
+++ b/src/backup/datastore.rs
@@ -267,8 +267,9 @@ impl DataStore {
full_path
}
- /// Remove a complete backup group including all snapshots
- pub fn remove_backup_group(&self, backup_group: &BackupGroup) -> Result<(), Error> {
+ /// Remove a complete backup group including all snapshots, returns true
+ /// if all snapshots were removed, and false if some were protected
+ pub fn remove_backup_group(&self, backup_group: &BackupGroup) -> Result<bool, Error> {
let full_path = self.group_path(backup_group);
@@ -276,22 +277,30 @@ impl DataStore {
log::info!("removing backup group {:?}", full_path);
+ let mut removed_all = true;
+
// remove all individual backup dirs first to ensure nothing is using them
for snap in backup_group.list_backups(&self.base_path())? {
+ if snap.backup_dir.is_protected(self.base_path()) {
+ removed_all = false;
+ continue;
+ }
self.remove_backup_dir(&snap.backup_dir, false)?;
}
- // no snapshots left, we can now safely remove the empty folder
- std::fs::remove_dir_all(&full_path)
- .map_err(|err| {
- format_err!(
- "removing backup group directory {:?} failed - {}",
- full_path,
- err,
- )
- })?;
+ if removed_all {
+ // no snapshots left, we can now safely remove the empty folder
+ std::fs::remove_dir_all(&full_path)
+ .map_err(|err| {
+ format_err!(
+ "removing backup group directory {:?} failed - {}",
+ full_path,
+ err,
+ )
+ })?;
+ }
- Ok(())
+ Ok(removed_all)
}
/// Remove a backup directory including all content
@@ -305,6 +314,10 @@ impl DataStore {
_manifest_guard = self.lock_manifest(backup_dir)?;
}
+ if backup_dir.is_protected(self.base_path()) {
+ bail!("cannot remove protected snapshot");
+ }
+
log::info!("removing backup snapshot {:?}", full_path);
std::fs::remove_dir_all(&full_path)
.map_err(|err| {
--
2.30.2
More information about the pbs-devel
mailing list