From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id CAC911FF16B for ; Tue, 29 Jul 2025 11:30:37 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4163CC58C; Tue, 29 Jul 2025 11:32:02 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Tue, 29 Jul 2025 11:31:38 +0200 Message-ID: <20250729093139.316600-5-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250729093139.316600-1-c.ebner@proxmox.com> References: <20250729093139.316600-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753781509539 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.045 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 proxmox-backup v2 4/5] pull: refactor source snapshot list filtering logic 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: , Reply-To: Proxmox Backup Server development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" In preparation for filter based on the snapshot's verify and encryption state before applying the transfer last cutoff. This will allow to correctly use the transfer last filter on the correspondingly prefiltered items only. Signed-off-by: Christian Ebner --- src/server/pull.rs | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/src/server/pull.rs b/src/server/pull.rs index 51c8aa2ea..ee9daf4cf 100644 --- a/src/server/pull.rs +++ b/src/server/pull.rs @@ -613,13 +613,6 @@ async fn pull_group( .await?; raw_list.sort_unstable_by(|a, b| a.backup.time.cmp(&b.backup.time)); - let total_amount = raw_list.len(); - - let cutoff = params - .transfer_last - .map(|count| total_amount.saturating_sub(count)) - .unwrap_or_default(); - let target_ns = source_namespace.map_prefix(¶ms.source.get_ns(), ¶ms.target.ns)?; let mut source_snapshots = HashSet::new(); @@ -633,8 +626,7 @@ async fn pull_group( // Also stores if the snapshot is corrupt (verification job failed) let list: Vec<(BackupDir, bool)> = raw_list .into_iter() - .enumerate() - .filter_map(|(pos, item)| { + .filter_map(|item| { let dir = item.backup; source_snapshots.insert(dir.time); @@ -666,6 +658,20 @@ async fn pull_group( } } } + Some((dir, false)) + }) + .collect(); + + let total_amount = list.len(); + let cutoff = params + .transfer_last + .map(|count| total_amount.saturating_sub(count)) + .unwrap_or_default(); + + let list: Vec<(BackupDir, bool)> = list + .into_iter() + .enumerate() + .filter_map(|(pos, (dir, verified))| { // Note: the snapshot represented by `last_sync_time` might be missing its backup log // or post-backup verification state if those were not yet available during the last // sync run, always resync it @@ -677,7 +683,7 @@ async fn pull_group( transfer_last_skip_info.update(dir.time); return None; } - Some((dir, false)) + Some((dir, verified)) }) .collect(); -- 2.47.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel