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 4E21E1FF15E for ; Mon, 24 Nov 2025 10:40:30 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0EBC41D147; Mon, 24 Nov 2025 10:40:39 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Mon, 24 Nov 2025 10:40:18 +0100 Message-ID: <20251124094018.224661-5-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251124094018.224661-1-c.ebner@proxmox.com> References: <20251124094018.224661-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1763977201108 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.048 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/4] datastore: refactor common delete list logic into closure 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" Reduce code duplication by defining a dedicated closure to update the delete list age and push file lock guarded chunk object keys to it. No functional changes intended. Signed-off-by: Christian Ebner --- Changes since version 1: - not present pbs-datastore/src/datastore.rs | 36 +++++++++++++++++++++++----------- 1 file changed, 25 insertions(+), 11 deletions(-) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index d88785c6d..077b199e6 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -1691,6 +1691,19 @@ impl DataStore { delete_list.clear(); Ok(()) }; + + let add_to_delete_list = + |delete_list: &mut Vec<(S3ObjectKey, BackupLockGuard)>, + delete_list_age: &mut i64, + key: S3ObjectKey, + _chunk_guard: BackupLockGuard| { + // set age based on first insertion + if delete_list.is_empty() { + *delete_list_age = epoch_i64(); + } + delete_list.push((key, _chunk_guard)); + }; + loop { for content in list_bucket_result.contents { let (chunk_path, digest, bad) = @@ -1745,12 +1758,12 @@ impl DataStore { std::fs::remove_file(chunk_path)?; } } - - // set age based on first insertion - if delete_list.is_empty() { - delete_list_age = epoch_i64(); - } - delete_list.push((content.key, _chunk_guard)); + add_to_delete_list( + &mut delete_list, + &mut delete_list_age, + content.key, + _chunk_guard, + ); Ok(()) }, )?; @@ -1758,11 +1771,12 @@ impl DataStore { } else { gc_status.removed_chunks += 1; gc_status.removed_bytes += content.size; - // set age based on first insertion - if delete_list.is_empty() { - delete_list_age = epoch_i64(); - } - delete_list.push((content.key, _chunk_guard)); + add_to_delete_list( + &mut delete_list, + &mut delete_list_age, + content.key, + _chunk_guard, + ); } chunk_count += 1; -- 2.47.3 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel