From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <pbs-devel-bounces@lists.proxmox.com>
Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9])
by lore.proxmox.com (Postfix) with ESMTPS id A13841FF15C
for <inbox@lore.proxmox.com>; Wed, 4 Sep 2024 11:18:18 +0200 (CEST)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 92D3A1676F;
Wed, 4 Sep 2024 11:18:51 +0200 (CEST)
Date: Wed, 04 Sep 2024 11:18:45 +0200
From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= <f.gruenbichler@proxmox.com>
To: Proxmox Backup Server development discussion <pbs-devel@lists.proxmox.com>
References: <20240724161856.398271-1-f.schauer@proxmox.com>
<20240724161856.398271-5-f.schauer@proxmox.com>
In-Reply-To: <20240724161856.398271-5-f.schauer@proxmox.com>
MIME-Version: 1.0
User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid)
Message-Id: <1725441444.sr52a0t9ma.astroid@yuna.none>
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.055 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: Re: [pbs-devel] [PATCH vma-to-pbs 4/4] improve readability of stdout
X-BeenThere: pbs-devel@lists.proxmox.com
X-Mailman-Version: 2.1.29
Precedence: list
List-Id: Proxmox Backup Server development discussion
<pbs-devel.lists.proxmox.com>
List-Unsubscribe: <https://lists.proxmox.com/cgi-bin/mailman/options/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=unsubscribe>
List-Archive: <http://lists.proxmox.com/pipermail/pbs-devel/>
List-Post: <mailto:pbs-devel@lists.proxmox.com>
List-Help: <mailto:pbs-devel-request@lists.proxmox.com?subject=help>
List-Subscribe: <https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel>,
<mailto:pbs-devel-request@lists.proxmox.com?subject=subscribe>
Reply-To: Proxmox Backup Server development discussion
<pbs-devel@lists.proxmox.com>
Content-Type: text/plain; charset="us-ascii"
Content-Transfer-Encoding: 7bit
Errors-To: pbs-devel-bounces@lists.proxmox.com
Sender: "pbs-devel" <pbs-devel-bounces@lists.proxmox.com>
On July 24, 2024 6:18 pm, Filip Schauer wrote:
> Do not spam stdout with messages for every single chunk uploaded.
> Instead, show the progress as a percentage every 1000 chunks and improve
> overall readability.
seems good enough as a stop-gap measure, but maybe we want to switch to
tracing-based logging here? having the option to turn on debug or trace
level logging and for example, printing VMA offsets and chunk info might
be nice sometimes..
> Signed-off-by: Filip Schauer <f.schauer@proxmox.com>
> ---
> src/vma2pbs.rs | 50 +++++++++++++++++++++++++++++++-------------------
> 1 file changed, 31 insertions(+), 19 deletions(-)
>
> diff --git a/src/vma2pbs.rs b/src/vma2pbs.rs
> index 5c0d03f..560ebd0 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};
> @@ -25,7 +26,7 @@ use proxmox_time::epoch_to_rfc3339;
> use scopeguard::defer;
> use serde_json::Value;
>
> -use crate::vma::VmaReader;
> +use crate::vma::{VmaReader, VMA_MAX_DEVICES};
>
> const VMA_CLUSTER_SIZE: usize = 65536;
>
> @@ -77,16 +78,14 @@ fn handle_pbs_error(pbs_err: *mut c_char, function_name: &str) -> Result<(), Err
> bail!("{function_name} failed: {pbs_err_str}");
> }
>
> -fn create_pbs_backup_task(pbs_args: &PbsArgs, backup_args: &VmaBackupArgs) -> Result<*mut ProxmoxBackupHandle, Error> {
> - println!("PBS repository: {}", pbs_args.pbs_repository);
> - if let Some(ns) = &pbs_args.namespace {
> - println!("PBS namespace: {}", ns);
> - }
> - println!("PBS fingerprint: {}", pbs_args.fingerprint);
> - println!("compress: {}", pbs_args.compress);
> - println!("encrypt: {}", pbs_args.encrypt);
> -
> - println!("backup time: {}", epoch_to_rfc3339(backup_args.backup_time)?);
> +fn create_pbs_backup_task(
> + pbs_args: &PbsArgs,
> + backup_args: &VmaBackupArgs,
> +) -> Result<*mut ProxmoxBackupHandle, Error> {
> + println!(
> + "\tbackup time: {}",
> + epoch_to_rfc3339(backup_args.backup_time)?
> + );
>
> let mut pbs_err: *mut c_char = ptr::null_mut();
>
> @@ -153,7 +152,7 @@ where
> let config_name = config.name;
> let config_data = config.content;
>
> - println!("CFG: size: {} name: {}", config_data.len(), config_name);
> + println!("\tCFG: size: {} name: {}", config_data.len(), config_name);
>
> let config_name_cstr = CString::new(config_name)?;
>
> @@ -192,7 +191,7 @@ where
> let device_size = vma_reader.get_device_size(device_id)?;
>
> println!(
> - "DEV: dev_id={} size: {} devname: {}",
> + "\tDEV: dev_id={} size: {} devname: {}",
> device_id, device_size, device_name
> );
>
> @@ -235,6 +234,8 @@ where
> non_zero_mask: u64,
> }
>
> + let chunk_stats = Arc::new(Mutex::new([0u64; VMA_MAX_DEVICES]));
> +
> let images_chunks: RefCell<HashMap<u8, HashMap<u64, ImageChunk>>> =
> RefCell::new(HashMap::new());
>
> @@ -279,12 +280,14 @@ where
> };
>
> let pbs_upload_chunk = |pbs_chunk_buffer: Option<&[u8]>| {
> - println!(
> - "Uploading dev_id: {} offset: {:#0X} - {:#0X}",
> - dev_id,
> - 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;
> + 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]
> + / device_size;
> + println!("\tUploading dev_id: {} ({}%)", dev_id, percentage);
> + }
>
> let mut pbs_err: *mut c_char = ptr::null_mut();
>
> @@ -468,6 +471,15 @@ fn set_notes(
> }
>
> pub fn vma2pbs(args: BackupVmaToPbsArgs) -> Result<(), Error> {
> + let pbs_args = &args.pbs_args;
> + println!("PBS repository: {}", pbs_args.pbs_repository);
> + if let Some(ns) = &pbs_args.namespace {
> + println!("PBS namespace: {}", ns);
> + }
> + println!("PBS fingerprint: {}", pbs_args.fingerprint);
> + println!("compress: {}", pbs_args.compress);
> + println!("encrypt: {}", pbs_args.encrypt);
> +
> let start_transfer_time = SystemTime::now();
>
> for backup_args in args.vmas {
> --
> 2.39.2
>
>
>
> _______________________________________________
> 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