From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id D80C86113B for ; Fri, 18 Feb 2022 08:38:34 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C9E6526F56 for ; Fri, 18 Feb 2022 08:38:04 +0100 (CET) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS id 22D8626F4B for ; Fri, 18 Feb 2022 08:38:04 +0100 (CET) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id EE972437EF for ; Fri, 18 Feb 2022 08:38:03 +0100 (CET) Message-ID: Date: Fri, 18 Feb 2022 08:38:02 +0100 MIME-Version: 1.0 User-Agent: Mozilla/5.0 (X11; Linux x86_64; rv:98.0) Gecko/20100101 Thunderbird/98.0 Content-Language: en-US To: Proxmox Backup Server development discussion , Markus Frank References: <20220217125859.804194-1-m.frank@proxmox.com> From: Thomas Lamprecht In-Reply-To: <20220217125859.804194-1-m.frank@proxmox.com> Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.058 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment NICE_REPLY_A -0.001 Looks like a legit reply (A) 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 proxmox-backup] fix #3323: dry-run for cli backup subcommand 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: , X-List-Received-Date: Fri, 18 Feb 2022 07:38:34 -0000 On 17.02.22 13:58, Markus Frank wrote: > adds a dry-run parameter for "proxmox-backup-client backup". > With this parameter on, it simply prints out what would be uploaded, > instead of uploading it. > looks ok in general, some comments to code style, or better said, refactor potential inline. > Signed-off-by: Markus Frank > --- > proxmox-backup-client/src/main.rs | 194 +++++++++++++++++------------- > 1 file changed, 112 insertions(+), 82 deletions(-) > > diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs > index 081028f2..b992695c 100644 > --- a/proxmox-backup-client/src/main.rs > +++ b/proxmox-backup-client/src/main.rs > @@ -613,6 +613,11 @@ fn spawn_catalog_upload( > description: "Verbose output.", > optional: true, > }, > + "dry-run": { > + type: Boolean, > + description: "Just show what backup would do, but do not upload anything.", > + optional: true, > + }, > } > } > )] > @@ -633,6 +638,8 @@ async fn create_backup( > > let verbose = param["verbose"].as_bool().unwrap_or(false); > > + let dry_run = param["dry-run"].as_bool().unwrap_or(false); > + > let backup_time_opt = param["backup-time"].as_i64(); > > let chunk_size_opt = param["chunk-size"].as_u64().map(|v| (v*1024) as usize); > @@ -845,94 +852,117 @@ async fn create_backup( > let mut catalog_result_rx = None; > > for (backup_type, filename, target, size) in upload_list { > - match backup_type { did you tried of either matching the tuple (backup_type, dry_run) or using if's in the match arm, e.g., something like: match backup_type { BackupSpecificationType::CONFIG if dry_run => printdry("config file", filename), BackupSpecificationType::LOGFILE if dry_run => printdry("log file", filename), ... BackupSpecificationType::CONFIG => { let upload_options = UploadOptions { ... }, ..., } The one with matching the tuple has the slight advantage of ensuring that we'd ensure to always cover all possibilities, that'd be relevant e.g., if a new type gets added to avoid it's send by mistake if one forgot to add an explicit dry run here, i.e., something that your current solution also avoids. > - BackupSpecificationType::CONFIG => { > - let upload_options = UploadOptions { > - compress: true, > - encrypt: crypto.mode == CryptMode::Encrypt, > - ..UploadOptions::default() > - }; > - > - println!("Upload config file '{}' to '{}' as {}", filename, repo, target); > - let stats = client > - .upload_blob_from_file(&filename, &target, upload_options) > - .await?; > - manifest.add_file(target, stats.size, stats.csum, crypto.mode)?; > - } > - BackupSpecificationType::LOGFILE => { // fixme: remove - not needed anymore ? > - let upload_options = UploadOptions { > - compress: true, > - encrypt: crypto.mode == CryptMode::Encrypt, > - ..UploadOptions::default() > - }; > - > - println!("Upload log file '{}' to '{}' as {}", filename, repo, target); > - let stats = client > - .upload_blob_from_file(&filename, &target, upload_options) > - .await?; > - manifest.add_file(target, stats.size, stats.csum, crypto.mode)?; > - } > - BackupSpecificationType::PXAR => { > - // start catalog upload on first use > - if catalog.is_none() { > - let catalog_upload_res = spawn_catalog_upload(client.clone(), crypto.mode == CryptMode::Encrypt)?; > - catalog = Some(catalog_upload_res.catalog_writer); > - catalog_result_rx = Some(catalog_upload_res.result); > + if dry_run { > + match backup_type { > + BackupSpecificationType::CONFIG => { > + println!("Would upload config file'{}' to '{}' as {}", filename, repo, target); please factor above print out in a local closure/helper-fn, besides reducing repetition it would also avoid on having inconsistencies like missing a whitespace after "file" ;-)