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 BF3491FF15C for ; Wed, 13 Nov 2024 16:58:40 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B10551A14B; Wed, 13 Nov 2024 16:58:41 +0100 (CET) From: Filip Schauer To: pbs-devel@lists.proxmox.com Date: Wed, 13 Nov 2024 16:58:02 +0100 Message-Id: <20241113155802.190824-5-f.schauer@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20241113155802.190824-1-f.schauer@proxmox.com> References: <20241113155802.190824-1-f.schauer@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.031 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 vma-to-pbs v6 4/4] log device upload progress as a percentage 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" Log the upload progress of a device as a percentage with log level info every 1000 chunks. Signed-off-by: Filip Schauer --- src/vma2pbs.rs | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/src/vma2pbs.rs b/src/vma2pbs.rs index af60e44..7457b9a 100644 --- a/src/vma2pbs.rs +++ b/src/vma2pbs.rs @@ -6,6 +6,8 @@ use std::fs::File; use std::io::{stdin, BufRead, BufReader, Read}; use std::process::{Command, Stdio}; use std::ptr; +use std::sync::atomic::{AtomicU64, Ordering}; +use std::sync::Arc; use std::time::SystemTime; use anyhow::{anyhow, bail, Error}; @@ -229,6 +231,8 @@ where non_zero_mask: u64, } + let chunk_stats = Arc::new([const { AtomicU64::new(0) }; VMA_MAX_DEVICES]); + let images_chunks: RefCell>> = RefCell::new(HashMap::new()); @@ -277,6 +281,11 @@ where "\tUploading dev_id: {dev_id} offset: {pbs_chunk_offset:#0X} - {:#0X}", pbs_chunk_offset + pbs_chunk_size, ); + let chunk_stat = chunk_stats[dev_id as usize].fetch_add(1, Ordering::SeqCst); + if (chunk_stat % 1000) == 0 { + let percentage = 100 * PROXMOX_BACKUP_DEFAULT_CHUNK_SIZE * chunk_stat / device_size; + log::info!("\tUploading dev_id: {dev_id} ({percentage}%)"); + } let mut pbs_err: *mut c_char = ptr::null_mut(); -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel