From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: <pbs-devel-bounces@lists.proxmox.com> Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id 0EBB11FF16F for <inbox@lore.proxmox.com>; Tue, 13 May 2025 15:53:14 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 31D4F33346; Tue, 13 May 2025 15:53:36 +0200 (CEST) From: Christian Ebner <c.ebner@proxmox.com> To: pbs-devel@lists.proxmox.com Date: Tue, 13 May 2025 15:52:36 +0200 Message-Id: <20250513135247.644260-10-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250513135247.644260-1-c.ebner@proxmox.com> References: <20250513135247.644260-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.029 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy 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 v3 proxmox-backup 09/20] sync: ignore trashed snapshots/groups when reading from local source X-BeenThere: pbs-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox Backup Server development discussion <pbs-devel.lists.proxmox.com> List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe> List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/> List-Post: <mailto:pbs-devel@lists.proxmox.com> List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help> List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>, <mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe> Reply-To: Proxmox Backup Server development discussion <pbs-devel@lists.proxmox.com> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com> Trashed snapshots and backup groups should never be synced, so filter them out when listing the contents to be synced. Signed-off-by: Christian Ebner <c.ebner@proxmox.com> --- src/server/sync.rs | 2 ++ 1 file changed, 2 insertions(+) diff --git a/src/server/sync.rs b/src/server/sync.rs index 09814ef0c..a32c914ff 100644 --- a/src/server/sync.rs +++ b/src/server/sync.rs @@ -447,6 +447,7 @@ impl SyncSource for LocalSource { Some(owner), )? .filter_map(Result::ok) + .filter(|backup_group| !backup_group.is_trash()) .map(|backup_group| backup_group.group().clone()) .collect::<Vec<pbs_api_types::BackupGroup>>()) } @@ -461,6 +462,7 @@ impl SyncSource for LocalSource { .backup_group(namespace.clone(), group.clone()) .iter_snapshots()? .filter_map(Result::ok) + .filter(|snapshot| !snapshot.is_trash()) .map(|snapshot| snapshot.dir().to_owned()) .collect::<Vec<BackupDir>>()) } -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel