From: Dominik Csapak <d.csapak@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v3 06/13] pull_store/group: dont try remove locally protected snapshots
Date: Wed, 27 Oct 2021 13:22:31 +0200 [thread overview]
Message-ID: <20211027112238.3758515-7-d.csapak@proxmox.com> (raw)
In-Reply-To: <20211027112238.3758515-1-d.csapak@proxmox.com>
and log if a vanished groups could not be completely deleted if it
contains protected snapshots
Signed-off-by: Dominik Csapak <d.csapak@proxmox.com>
---
src/server/pull.rs | 20 +++++++++++++++++---
1 file changed, 17 insertions(+), 3 deletions(-)
diff --git a/src/server/pull.rs b/src/server/pull.rs
index a15d3bb5..555f0a94 100644
--- a/src/server/pull.rs
+++ b/src/server/pull.rs
@@ -605,6 +605,14 @@ pub async fn pull_group(
if remote_snapshots.contains(&backup_time) {
continue;
}
+ if info.backup_dir.is_protected(tgt_store.base_path()) {
+ task_log!(
+ worker,
+ "don't delete vanished snapshot {:?} (protected)",
+ info.backup_dir.relative_path()
+ );
+ continue;
+ }
task_log!(worker, "delete vanished snapshot {:?}", info.backup_dir.relative_path());
tgt_store.remove_backup_dir(&info.backup_dir, false)?;
}
@@ -719,9 +727,15 @@ pub async fn pull_store(
local_group.backup_type(),
local_group.backup_id()
);
- if let Err(err) = tgt_store.remove_backup_group(&local_group) {
- task_log!(worker, "{}", err.to_string());
- errors = true;
+ match tgt_store.remove_backup_group(&local_group) {
+ Ok(true) => {},
+ Ok(false) => {
+ task_log!(worker, "kept some protected snapshots of group '{}'", local_group);
+ },
+ Err(err) => {
+ task_log!(worker, "{}", err);
+ errors = true;
+ }
}
}
Ok(())
--
2.30.2
next prev parent reply other threads:[~2021-10-27 11:23 UTC|newest]
Thread overview: 19+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-10-27 11:22 [pbs-devel] [PATCH proxmox-backup v3 00/13] add 'protected' setting for snapshots Dominik Csapak
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 01/13] pbs-datastore: add protection info to BackupInfo Dominik Csapak
2021-10-28 9:05 ` Wolfgang Bumiller
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 02/13] pbs-datastore: skip protected backups in pruning Dominik Csapak
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 03/13] add protected info of snapshots to api and task logs Dominik Csapak
2021-10-28 9:05 ` Wolfgang Bumiller
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 04/13] tests/prune: add tests for protecteded backups Dominik Csapak
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 05/13] backup/datastore: prevent protected snapshots to be removed Dominik Csapak
2021-10-27 11:22 ` Dominik Csapak [this message]
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 07/13] api2: datastore/delete_group: throw error for partially removed group Dominik Csapak
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 08/13] api2/admin/datastore: add get/set_protection Dominik Csapak
2021-10-28 9:05 ` Wolfgang Bumiller
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 09/13] proxmox-backup-client: add 'protected' commands Dominik Csapak
2021-10-28 9:05 ` Wolfgang Bumiller
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 10/13] ui: PruneInputPanel: add keepReason 'protected' for protected backups Dominik Csapak
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 11/13] ui: add protected icon to snapshots Dominik Csapak
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 12/13] fix #3602: ui: datastore/Content: add action to set protection status Dominik Csapak
2021-10-27 11:22 ` [pbs-devel] [PATCH proxmox-backup v3 13/13] docs: add info about protection flag to client docs Dominik Csapak
2021-10-28 9:33 ` [pbs-devel] applied series: [PATCH proxmox-backup v3 00/13] add 'protected' setting for snapshots Wolfgang Bumiller
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=20211027112238.3758515-7-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