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 2E8EC79E0B for ; Thu, 28 Oct 2021 11:05:41 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 213DE1D817 for ; Thu, 28 Oct 2021 11:05:41 +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 86B3A1D80C for ; Thu, 28 Oct 2021 11:05:40 +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 5D0D845AD9 for ; Thu, 28 Oct 2021 11:05:40 +0200 (CEST) Date: Thu, 28 Oct 2021 11:05:39 +0200 From: Wolfgang Bumiller To: Dominik Csapak Cc: pbs-devel@lists.proxmox.com Message-ID: <20211028090539.cprbdfnjgypd3xuq@olga.proxmox.com> References: <20211027112238.3758515-1-d.csapak@proxmox.com> <20211027112238.3758515-4-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Type: text/plain; charset=us-ascii Content-Disposition: inline In-Reply-To: <20211027112238.3758515-4-d.csapak@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.591 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. [datastore.rs, prune.rs] Subject: Re: [pbs-devel] [PATCH proxmox-backup v3 03/13] add protected info of snapshots to api and task logs 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:05:41 -0000 more minor nitpicking On Wed, Oct 27, 2021 at 01:22:28PM +0200, Dominik Csapak wrote: > adds the info that a snapshot is protected to: > * snapshot list > * manual pruning (also dry-run) > * prune jobs > > Signed-off-by: Dominik Csapak > --- > pbs-api-types/src/datastore.rs | 2 ++ > pbs-datastore/src/prune.rs | 40 +++++++++++++++++++++++++++------- > src/api2/admin/datastore.rs | 15 ++++++++----- > src/server/prune_job.rs | 6 ++--- > tests/prune.rs | 4 ++-- > 5 files changed, 49 insertions(+), 18 deletions(-) > > diff --git a/pbs-api-types/src/datastore.rs b/pbs-api-types/src/datastore.rs > index 462081e4..77c1258f 100644 > --- a/pbs-api-types/src/datastore.rs > +++ b/pbs-api-types/src/datastore.rs > @@ -390,6 +390,8 @@ pub struct SnapshotListItem { > /// The owner of the snapshots group > #[serde(skip_serializing_if = "Option::is_none")] > pub owner: Option, > + /// Protection from prunes > + pub protected: bool, > } > > #[api( > diff --git a/pbs-datastore/src/prune.rs b/pbs-datastore/src/prune.rs > index 0eaa8acd..e66ed408 100644 > --- a/pbs-datastore/src/prune.rs > +++ b/pbs-datastore/src/prune.rs > @@ -7,7 +7,30 @@ use pbs_api_types::PruneOptions; > > use super::BackupInfo; > > -enum PruneMark { Protected, Keep, KeepPartial, Remove } > +#[derive(Clone, Copy, PartialEq, Eq)] > +pub enum PruneMark { Protected, Keep, KeepPartial, Remove } > + > +impl PruneMark { > + pub fn keep(&self) -> bool { It's a tiny `Copy` type, you can drop the `&` above and `*` below in boht methods. > + *self != PruneMark::Remove > + } > + > + pub fn protected(&self) -> bool { > + *self == PruneMark::Protected > + } > +} > + > +impl std::fmt::Display for PruneMark { > + fn fmt(&self, f: &mut std::fmt::Formatter<'_>) -> std::fmt::Result { > + let txt = match self { f.write_str(match self { > + PruneMark::Protected => "protected", > + PruneMark::Keep => "keep", > + PruneMark::KeepPartial => "keep-partial", > + PruneMark::Remove => "remove", > + }; }) drop the `write!` usage > + write!(f, "{}", txt) > + } > +} > > fn mark_selections Result> ( > mark: &mut HashMap, > @@ -125,7 +148,7 @@ pub fn cli_options_string(options: &PruneOptions) -> String { > pub fn compute_prune_info( > mut list: Vec, > options: &PruneOptions, > -) -> Result, Error> { > +) -> Result, Error> { > > let mut mark = HashMap::new(); > > @@ -173,15 +196,16 @@ pub fn compute_prune_info( > })?; > } > > - let prune_info: Vec<(BackupInfo, bool)> = list.into_iter() > + let prune_info: Vec<(BackupInfo, PruneMark)> = list.into_iter() > .map(|info| { > let backup_id = info.backup_dir.relative_path(); > - let keep = match mark.get(&backup_id) { > - Some(PruneMark::Keep) => true, > - Some(PruneMark::KeepPartial) => true, > - _ => false, > + let mark = if info.protected { > + PruneMark::Protected > + } else { > + *mark.get(&backup_id).unwrap_or(&PruneMark::Remove) (could use `.copied()` instead of `*` and `&`) > }; > - (info, keep) > + > + (info, mark) > }) > .collect(); >