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 EE0051FF389 for ; Wed, 5 Jun 2024 13:01:32 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 31442324C9; Wed, 5 Jun 2024 13:02:01 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 5 Jun 2024 12:53:50 +0200 Message-Id: <20240605105416.278748-33-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20240605105416.278748-1-c.ebner@proxmox.com> References: <20240605105416.278748-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.028 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH v9 proxmox-backup 32/58] client: backup writer: add injected chunk count to stats 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" Track the number of injected chunks and show them in the debug output Signed-off-by: Christian Ebner --- changes since version 8: - no changes pbs-client/src/backup_writer.rs | 20 ++++++++++++++++++++ 1 file changed, 20 insertions(+) diff --git a/pbs-client/src/backup_writer.rs b/pbs-client/src/backup_writer.rs index b2ada85cd..c22978096 100644 --- a/pbs-client/src/backup_writer.rs +++ b/pbs-client/src/backup_writer.rs @@ -57,8 +57,10 @@ pub struct UploadOptions { struct UploadStats { chunk_count: usize, chunk_reused: usize, + chunk_injected: usize, size: usize, size_reused: usize, + size_injected: usize, size_compressed: usize, duration: std::time::Duration, csum: [u8; 32], @@ -355,6 +357,14 @@ impl BackupWriter { pbs_tools::format::strip_server_file_extension(archive_name) }; + if upload_stats.chunk_injected > 0 { + log::info!( + "{archive}: reused {} from previous snapshot for unchanged files ({} chunks)", + HumanByte::from(upload_stats.size_injected), + upload_stats.chunk_injected, + ); + } + if archive_name != CATALOG_NAME { let speed: HumanByte = ((size_dirty * 1_000_000) / (upload_stats.duration.as_micros() as usize)).into(); @@ -645,6 +655,8 @@ impl BackupWriter { let total_chunks2 = total_chunks.clone(); let known_chunk_count = Arc::new(AtomicUsize::new(0)); let known_chunk_count2 = known_chunk_count.clone(); + let injected_chunk_count = Arc::new(AtomicUsize::new(0)); + let injected_chunk_count2 = injected_chunk_count.clone(); let stream_len = Arc::new(AtomicUsize::new(0)); let stream_len2 = stream_len.clone(); @@ -652,6 +664,8 @@ impl BackupWriter { let compressed_stream_len2 = compressed_stream_len.clone(); let reused_len = Arc::new(AtomicUsize::new(0)); let reused_len2 = reused_len.clone(); + let injected_len = Arc::new(AtomicUsize::new(0)); + let injected_len2 = injected_len.clone(); let append_chunk_path = format!("{}_index", prefix); let upload_chunk_path = format!("{}_chunk", prefix); @@ -672,6 +686,7 @@ impl BackupWriter { // account for injected chunks let count = chunks.len(); total_chunks.fetch_add(count, Ordering::SeqCst); + injected_chunk_count.fetch_add(count, Ordering::SeqCst); let mut known = Vec::new(); let mut guard = index_csum.lock().unwrap(); @@ -680,6 +695,7 @@ impl BackupWriter { let offset = stream_len.fetch_add(chunk.size() as usize, Ordering::SeqCst) as u64; reused_len.fetch_add(chunk.size() as usize, Ordering::SeqCst); + injected_len.fetch_add(chunk.size() as usize, Ordering::SeqCst); let digest = chunk.digest(); known.push((offset, digest)); let end_offset = offset + chunk.size(); @@ -795,8 +811,10 @@ impl BackupWriter { let duration = start_time.elapsed(); let chunk_count = total_chunks2.load(Ordering::SeqCst); let chunk_reused = known_chunk_count2.load(Ordering::SeqCst); + let chunk_injected = injected_chunk_count2.load(Ordering::SeqCst); let size = stream_len2.load(Ordering::SeqCst); let size_reused = reused_len2.load(Ordering::SeqCst); + let size_injected = injected_len2.load(Ordering::SeqCst); let size_compressed = compressed_stream_len2.load(Ordering::SeqCst) as usize; let mut guard = index_csum_2.lock().unwrap(); @@ -805,8 +823,10 @@ impl BackupWriter { futures::future::ok(UploadStats { chunk_count, chunk_reused, + chunk_injected, size, size_reused, + size_injected, size_compressed, duration, csum, -- 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel