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 3D3FB79DC7 for ; Thu, 28 Oct 2021 11:06:05 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 390A11D80B for ; Thu, 28 Oct 2021 11:05:35 +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) server-digest SHA256) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 8913B1D7FF for ; Thu, 28 Oct 2021 11:05:34 +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 5A80345AD9 for ; Thu, 28 Oct 2021 11:05:34 +0200 (CEST) Date: Thu, 28 Oct 2021 11:05:33 +0200 From: Wolfgang Bumiller To: Dominik Csapak Cc: pbs-devel@lists.proxmox.com Message-ID: <20211028090533.svxybifqk6xoj3bl@olga.proxmox.com> References: <20211027112238.3758515-1-d.csapak@proxmox.com> <20211027112238.3758515-2-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211027112238.3758515-2-d.csapak@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.594 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 URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more information. [prune.rs] Subject: Re: [pbs-devel] [PATCH proxmox-backup v3 01/13] 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: Thu, 28 Oct 2021 09:06:05 -0000 minor nitpicking below On Wed, Oct 27, 2021 at 01:22:26PM +0200, Dominik Csapak wrote: > and add necessary helper functions (protected_file/is_protected) > > Signed-off-by: Dominik Csapak > --- > pbs-datastore/src/backup_info.rs | 20 ++++++++++++++++++-- > tests/prune.rs | 2 +- > 2 files changed, 19 insertions(+), 3 deletions(-) > > diff --git a/pbs-datastore/src/backup_info.rs b/pbs-datastore/src/backup_info.rs > index 9d1ab991..b94b9779 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 { Please also name the parameter `base_path`. It's already weird because it's `BackupDir::relative_path` (explicit 'relative' in the name) vs `BackupGroup::group_path` (which is also relative, but doesn't explicitly say that it is). I'm also not convinced this should take a `PathBuf`, I find `&Path` (or even Cow or AsRef) makes a lot more sense here, and all our callers will be cloning anyway. (and in the remaining patches, the only places where the path is already an owned PathBuf should in fact not actually have an owned PathBuf in the first place, so I'd rather have that cleaned up where it comes from...) > + path.push(self.relative_path()); > + path.push(".protected"); > + path > + } > + > + pub fn is_protected(&self, base_path: PathBuf) -> bool { same > + 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) > Ok(proxmox_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 {