From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id BE760707F7 for ; Mon, 6 Sep 2021 12:58:28 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 7E954F911 for ; Mon, 6 Sep 2021 12:57:58 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 8BA74F8B9 for ; Mon, 6 Sep 2021 12:57:56 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 576DD445CA for ; Mon, 6 Sep 2021 12:57:56 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Mon, 6 Sep 2021 12:57:44 +0200 Message-Id: <20210906105755.2651203-2-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210906105755.2651203-1-d.csapak@proxmox.com> References: <20210906105755.2651203-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.436 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup 01/12] pbs-datastore: add protection info to BackupInfo X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Mon, 06 Sep 2021 10:58:28 -0000 and add necessary helper functions (protected_file/is_protected) Signed-off-by: Dominik Csapak --- pbs-datastore/src/backup_info.rs | 20 ++++++++++++++++++-- tests/prune.rs | 4 ++-- 2 files changed, 20 insertions(+), 4 deletions(-) diff --git a/pbs-datastore/src/backup_info.rs b/pbs-datastore/src/backup_info.rs index f77098ee..032fad8b 100644 --- a/pbs-datastore/src/backup_info.rs +++ b/pbs-datastore/src/backup_info.rs @@ -92,7 +92,9 @@ impl BackupGroup { BackupDir::with_rfc3339(&self.backup_type, &self.backup_id, backup_time)?; let files = list_backup_files(l2_fd, backup_time)?; - list.push(BackupInfo { backup_dir, files }); + let protected = backup_dir.is_protected(base_path.to_owned()); + + list.push(BackupInfo { backup_dir, files, protected }); Ok(()) }, @@ -253,6 +255,17 @@ impl BackupDir { relative_path } + pub fn protected_file(&self, mut path: PathBuf) -> PathBuf { + path.push(self.relative_path()); + path.push(".protected"); + path + } + + pub fn is_protected(&self, base_path: PathBuf) -> bool { + let path = self.protected_file(base_path); + path.exists() + } + pub fn backup_time_to_string(backup_time: i64) -> Result { // fixme: can this fail? (avoid unwrap) proxmox::tools::time::epoch_to_rfc3339_utc(backup_time) @@ -293,6 +306,8 @@ pub struct BackupInfo { pub backup_dir: BackupDir, /// List of data files pub files: Vec, + /// Protection Status + pub protected: bool, } impl BackupInfo { @@ -301,8 +316,9 @@ impl BackupInfo { path.push(backup_dir.relative_path()); let files = list_backup_files(libc::AT_FDCWD, &path)?; + let protected = backup_dir.is_protected(base_path.to_owned()); - Ok(BackupInfo { backup_dir, files }) + Ok(BackupInfo { backup_dir, files, protected }) } /// Finds the latest backup inside a backup group diff --git a/tests/prune.rs b/tests/prune.rs index 3297b031..5c61cbf9 100644 --- a/tests/prune.rs +++ b/tests/prune.rs @@ -17,7 +17,7 @@ fn get_prune_list( prune_info .iter() - .filter_map(|(info, keep)| { + .filter_map(|(info, keep, _)| { if *keep != return_kept { None } else { @@ -40,7 +40,7 @@ fn create_info( files.push(String::from(MANIFEST_BLOB_NAME)); } - BackupInfo { backup_dir, files } + BackupInfo { backup_dir, files, protected: false } } #[test] -- 2.30.2