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 D4E361FF16E for ; Tue, 29 Oct 2024 11:39:24 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id E487034621; Tue, 29 Oct 2024 11:39:26 +0100 (CET) MIME-Version: 1.0 In-Reply-To: <20241022142843.142191-7-f.schauer@proxmox.com> References: <20241022142843.142191-1-f.schauer@proxmox.com> <20241022142843.142191-7-f.schauer@proxmox.com> From: Fabian =?utf-8?q?Gr=C3=BCnbichler?= To: Filip Schauer , pbs-devel@lists.proxmox.com Date: Tue, 29 Oct 2024 11:39:14 +0100 Message-ID: <173019835472.51916.5080576317785674835@yuna.proxmox.com> User-Agent: alot/0.10 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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. [proxmox.com, vma2pbs.rs] Subject: Re: [pbs-devel] [PATCH vma-to-pbs v3 6/6] 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" Quoting Filip Schauer (2024-10-22 16:28:43) > 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 | 11 +++++++++++ > 1 file changed, 11 insertions(+) > > diff --git a/src/vma2pbs.rs b/src/vma2pbs.rs > index a5907ed..d8bdccf 100644 > --- a/src/vma2pbs.rs > +++ b/src/vma2pbs.rs > @@ -6,6 +6,7 @@ use std::fs::File; > use std::io::{stdin, BufRead, BufReader, Read}; > use std::process::{Command, Stdio}; > use std::ptr; > +use std::sync::{Arc, Mutex}; > use std::time::SystemTime; > > use anyhow::{anyhow, bail, Error}; > @@ -234,6 +235,8 @@ where > non_zero_mask: u64, > } > > + let chunk_stats = Arc::new(Mutex::new([0u64; VMA_MAX_DEVICES])); Arc::new([AtomicUsize::new(0); VMA_MAX_DEVICES]) > + > let images_chunks: RefCell>> = > RefCell::new(HashMap::new()); > > @@ -284,6 +287,14 @@ where > pbs_chunk_offset, > pbs_chunk_offset + pbs_chunk_size, > ); > + let mut chunk_stats_locked = chunk_stats.lock().unwrap(); > + chunk_stats_locked[dev_id as usize] += 1; then instead of this, just do a fetch_add, which returns the previous value > + if (chunk_stats_locked[dev_id as usize] % 1000) == 0 { > + let percentage = > + 100 * PROXMOX_BACKUP_DEFAULT_CHUNK_SIZE * chunk_stats_locked[dev_id as usize] which can then be used here, since without the Mutex, we don't have a guarantee that the current value will not be incremented from current % 1000 == 999 to current % 1000 == 1 before someone has a chance to hit this printing code ;) > + / 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 > > _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel