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 E6A3A6C78E for ; Thu, 23 Sep 2021 13:37:40 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E343E24C22 for ; Thu, 23 Sep 2021 13:37:40 +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 3563C24BFD for ; Thu, 23 Sep 2021 13:37: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 0D20644A83 for ; Thu, 23 Sep 2021 13:37:40 +0200 (CEST) From: Dominik Csapak To: pbs-devel@lists.proxmox.com Date: Thu, 23 Sep 2021 13:37:28 +0200 Message-Id: <20210923113739.4151043-3-d.csapak@proxmox.com> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20210923113739.4151043-1-d.csapak@proxmox.com> References: <20210923113739.4151043-1-d.csapak@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.363 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 v2 02/13] pbs-datastore: skip protected backups in pruning 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, 23 Sep 2021 11:37:40 -0000 as a separate keep reason so it will not be calculated for the other reasons Signed-off-by: Dominik Csapak --- pbs-datastore/src/prune.rs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/pbs-datastore/src/prune.rs b/pbs-datastore/src/prune.rs index 3b4cf4f2..1eb4208f 100644 --- a/pbs-datastore/src/prune.rs +++ b/pbs-datastore/src/prune.rs @@ -7,7 +7,7 @@ use pbs_api_types::PruneOptions; use super::BackupInfo; -enum PruneMark { Keep, KeepPartial, Remove } +enum PruneMark { Protected, Keep, KeepPartial, Remove } fn mark_selections Result> ( mark: &mut HashMap, @@ -30,6 +30,10 @@ fn mark_selections Result> ( for info in list { let backup_id = info.backup_dir.relative_path(); if mark.get(&backup_id).is_some() { continue; } + if info.protected { + mark.insert(backup_id, PruneMark::Protected); + continue; + } let sel_id: String = select_id(&info)?; if already_included.contains(&sel_id) { continue; } -- 2.30.2