From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id D4C991FF13A for ; Wed, 10 Jun 2026 20:02:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 05FD215633; Wed, 10 Jun 2026 20:02:26 +0200 (CEST) From: Shan Shaji To: pbs-devel@lists.proxmox.com Subject: [RFC PATCH proxmox-backup 1/6] refactor: rename `ReuseStats` struct to `PxarArchiverProgressStats` Date: Wed, 10 Jun 2026 20:02:03 +0200 Message-ID: <20260610180208.801614-2-s.shaji@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260610180208.801614-1-s.shaji@proxmox.com> References: <20260610180208.801614-1-s.shaji@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1781114494318 X-SPAM-LEVEL: Spam detection results: 0 AWL -1.153 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 ENA_SUBJ_ODD_CASE 2.6 Subject has odd case 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. [create.rs] Message-ID-Hash: 7IQZ6VDEZYJ7SZUPXMQR7NX475PXRHKC X-Message-ID-Hash: 7IQZ6VDEZYJ7SZUPXMQR7NX475PXRHKC X-MailFrom: s.shaji@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Backup Server development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: Earlier, the `ReuseStats` struct was used to count and show summary for metadata mode. Since, the same counter will be used to show stats for both legacy and data mode, rename `ReuseStats` struct to `PxarArchiverProgressStats` and its corresponding propery inside the archiver to `progress_stats`. Signed-off-by: Shan Shaji --- pbs-client/src/pxar/create.rs | 46 +++++++++++++++++------------------ 1 file changed, 23 insertions(+), 23 deletions(-) diff --git a/pbs-client/src/pxar/create.rs b/pbs-client/src/pxar/create.rs index 304de4d83..c7f26879e 100644 --- a/pbs-client/src/pxar/create.rs +++ b/pbs-client/src/pxar/create.rs @@ -150,7 +150,7 @@ pub(crate) struct HardLinkInfo { } #[derive(Default)] -struct ReuseStats { +struct PxarArchiverProgressStats { files_reused_count: u64, files_hardlink_count: u64, files_reencoded_count: u64, @@ -193,7 +193,7 @@ struct Archiver { // an older client without the encode-time check is detected here and the affected file is // re-encoded instead of reused. last_reusable_offset: Option, - reuse_stats: ReuseStats, + progress_stats: PxarArchiverProgressStats, split_archive: bool, } @@ -304,7 +304,7 @@ where previous_payload_index, cache: PxarLookaheadCache::new(options.max_cache_size), last_reusable_offset: None, - reuse_stats: ReuseStats::default(), + progress_stats: PxarArchiverProgressStats::default(), split_archive, }; @@ -325,28 +325,28 @@ where info!("Change detection summary:"); info!( " - {} total files ({} hardlinks)", - archiver.reuse_stats.files_reused_count - + archiver.reuse_stats.files_reencoded_count - + archiver.reuse_stats.files_hardlink_count, - archiver.reuse_stats.files_hardlink_count, + archiver.progress_stats.files_reused_count + + archiver.progress_stats.files_reencoded_count + + archiver.progress_stats.files_hardlink_count, + archiver.progress_stats.files_hardlink_count, ); info!( " - {} unchanged, reusable files with {} data", - archiver.reuse_stats.files_reused_count, - HumanByte::from(archiver.reuse_stats.total_reused_payload_size), + archiver.progress_stats.files_reused_count, + HumanByte::from(archiver.progress_stats.total_reused_payload_size), ); info!( " - {} changed or non-reusable files with {} data", - archiver.reuse_stats.files_reencoded_count, - HumanByte::from(archiver.reuse_stats.total_reencoded_size), + archiver.progress_stats.files_reencoded_count, + HumanByte::from(archiver.progress_stats.total_reencoded_size), ); info!( " - {} padding in {} partially reused chunks", HumanByte::from( - archiver.reuse_stats.total_injected_size - - archiver.reuse_stats.total_reused_payload_size + archiver.progress_stats.total_injected_size + - archiver.progress_stats.total_reused_payload_size ), - archiver.reuse_stats.partial_chunks_count, + archiver.progress_stats.partial_chunks_count, ); } Ok(()) @@ -971,24 +971,24 @@ impl Archiver { } let offset: LinkOffset = if let Some(payload_offset) = payload_offset { - self.reuse_stats.total_reused_payload_size += + self.progress_stats.total_reused_payload_size += file_size + size_of::() as u64; - self.reuse_stats.files_reused_count += 1; + self.progress_stats.files_reused_count += 1; encoder .add_payload_ref(metadata, file_name, file_size, payload_offset) .await? } else { - self.reuse_stats.total_reencoded_size += + self.progress_stats.total_reencoded_size += file_size + size_of::() as u64; - self.reuse_stats.files_reencoded_count += 1; + self.progress_stats.files_reencoded_count += 1; self.add_regular_file(encoder, fd, file_name, metadata, file_size) .await? }; if stat.st_nlink > 1 { - self.reuse_stats.files_hardlink_count += 1; + self.progress_stats.files_hardlink_count += 1; self.hardlinks .insert(link_info, (self.path.clone(), offset)); } @@ -1215,11 +1215,11 @@ impl Archiver { HumanByte::from(chunk.padding), HumanByte::from(chunk.size()), ); - self.reuse_stats.total_injected_size += chunk.size(); - self.reuse_stats.total_injected_count += 1; + self.progress_stats.total_injected_size += chunk.size(); + self.progress_stats.total_injected_count += 1; if chunk.padding > 0 { - self.reuse_stats.partial_chunks_count += 1; + self.progress_stats.partial_chunks_count += 1; } size = size.add(chunk.size()); @@ -2075,7 +2075,7 @@ mod tests { suggested_boundaries: Some(suggested_boundaries), cache: PxarLookaheadCache::new(None), last_reusable_offset: None, - reuse_stats: ReuseStats::default(), + progress_stats: PxarArchiverProgressStats::default(), split_archive: true, }; -- 2.47.3