From mboxrd@z Thu Jan 1 00:00:00 1970
Return-Path: <m.frank@proxmox.com>
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 6A5A260D12
for <pbs-devel@lists.proxmox.com>; Thu, 17 Feb 2022 14:00:08 +0100 (CET)
Received: from firstgate.proxmox.com (localhost [127.0.0.1])
by firstgate.proxmox.com (Proxmox) with ESMTP id 58C321F5A2
for <pbs-devel@lists.proxmox.com>; Thu, 17 Feb 2022 13:59:38 +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 58DDB1F599
for <pbs-devel@lists.proxmox.com>; Thu, 17 Feb 2022 13:59:37 +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 23D0746DEC
for <pbs-devel@lists.proxmox.com>; Thu, 17 Feb 2022 13:59:37 +0100 (CET)
From: Markus Frank <m.frank@proxmox.com>
To: pbs-devel@lists.proxmox.com
Date: Thu, 17 Feb 2022 13:58:59 +0100
Message-Id: <20220217125859.804194-1-m.frank@proxmox.com>
X-Mailer: git-send-email 2.30.2
MIME-Version: 1.0
Content-Transfer-Encoding: 8bit
X-SPAM-LEVEL: Spam detection results: 0
AWL 0.002 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
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 -
URIBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to URIBL was blocked. See
http://wiki.apache.org/spamassassin/DnsBlocklists#dnsbl-block for more
information. [main.rs]
Subject: [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
<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>
X-List-Received-Date: Thu, 17 Feb 2022 13:00:08 -0000
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.
Signed-off-by: Markus Frank <m.frank@proxmox.com>
---
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 {
- 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);
+ }
+ BackupSpecificationType::LOGFILE => {
+ println!("Would upload log file '{}' to '{}' as {}", filename, repo, target);
+ }
+ BackupSpecificationType::PXAR => {
+ println!("Would upload directory '{}' to '{}' as {}", filename, repo, target);
+ }
+ BackupSpecificationType::IMAGE => {
+ println!("Would upload image'{}' to '{}' as {}", filename, repo, target);
}
- let catalog = catalog.as_ref().unwrap();
-
- println!("Upload directory '{}' to '{}' as {}", filename, repo, target);
- catalog.lock().unwrap().start_directory(std::ffi::CString::new(target.as_str())?.as_c_str())?;
-
- let pxar_options = pbs_client::pxar::PxarCreateOptions {
- device_set: devices.clone(),
- patterns: pattern_list.clone(),
- entries_max: entries_max as usize,
- skip_lost_and_found,
- verbose,
- };
-
- let upload_options = UploadOptions {
- previous_manifest: previous_manifest.clone(),
- compress: true,
- encrypt: crypto.mode == CryptMode::Encrypt,
- ..UploadOptions::default()
- };
-
- let stats = backup_directory(
- &client,
- &filename,
- &target,
- chunk_size_opt,
- catalog.clone(),
- pxar_options,
- upload_options,
- ).await?;
- manifest.add_file(target, stats.size, stats.csum, crypto.mode)?;
- catalog.lock().unwrap().end_directory()?;
+
}
- BackupSpecificationType::IMAGE => {
- println!("Upload image '{}' to '{:?}' as {}", filename, repo, target);
-
- let upload_options = UploadOptions {
- previous_manifest: previous_manifest.clone(),
- fixed_size: Some(size),
- compress: true,
- encrypt: crypto.mode == CryptMode::Encrypt,
- };
-
- let stats = backup_image(
- &client,
- &filename,
- &target,
- chunk_size_opt,
- upload_options,
- ).await?;
- manifest.add_file(target, stats.size, stats.csum, crypto.mode)?;
+ } else {
+ match backup_type {
+ 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);
+ }
+ let catalog = catalog.as_ref().unwrap();
+
+ println!("Upload directory '{}' to '{}' as {}", filename, repo, target);
+ catalog.lock().unwrap().start_directory(std::ffi::CString::new(target.as_str())?.as_c_str())?;
+
+ let pxar_options = pbs_client::pxar::PxarCreateOptions {
+ device_set: devices.clone(),
+ patterns: pattern_list.clone(),
+ entries_max: entries_max as usize,
+ skip_lost_and_found,
+ verbose,
+ };
+
+ let upload_options = UploadOptions {
+ previous_manifest: previous_manifest.clone(),
+ compress: true,
+ encrypt: crypto.mode == CryptMode::Encrypt,
+ ..UploadOptions::default()
+ };
+
+ let stats = backup_directory(
+ &client,
+ &filename,
+ &target,
+ chunk_size_opt,
+ catalog.clone(),
+ pxar_options,
+ upload_options,
+ ).await?;
+ manifest.add_file(target, stats.size, stats.csum, crypto.mode)?;
+ catalog.lock().unwrap().end_directory()?;
+ }
+ BackupSpecificationType::IMAGE => {
+ println!("Upload image '{}' to '{:?}' as {}", filename, repo, target);
+
+ let upload_options = UploadOptions {
+ previous_manifest: previous_manifest.clone(),
+ fixed_size: Some(size),
+ compress: true,
+ encrypt: crypto.mode == CryptMode::Encrypt,
+ };
+
+ let stats = backup_image(
+ &client,
+ &filename,
+ &target,
+ chunk_size_opt,
+ upload_options,
+ ).await?;
+ manifest.add_file(target, stats.size, stats.csum, crypto.mode)?;
+ }
}
}
}
+ if dry_run {
+ println!("dry-run: no upload happend");
+ return Ok(Value::Null);
+ }
+
// finalize and upload catalog
if let Some(catalog) = catalog {
let mutex = Arc::try_unwrap(catalog)
--
2.30.2