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 41332604FE for ; Wed, 2 Sep 2020 11:41:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 28F5EF757 for ; Wed, 2 Sep 2020 11:41:33 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [212.186.127.180]) (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 92F36F735 for ; Wed, 2 Sep 2020 11:41:31 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 5FED142D75 for ; Wed, 2 Sep 2020 11:41:31 +0200 (CEST) From: Hannes Laimer To: pbs-devel@lists.proxmox.com Date: Wed, 2 Sep 2020 11:41:22 +0200 Message-Id: <20200902094122.104475-2-h.laimer@proxmox.com> X-Mailer: git-send-email 2.20.1 In-Reply-To: <20200902094122.104475-1-h.laimer@proxmox.com> References: <20200902094122.104475-1-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-SPAM-LEVEL: Spam detection results: 0 KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RCVD_IN_DNSWL_MED -2.3 Sender listed at https://www.dnswl.org/, medium trust 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. [benchmark.rs, backup.rs, proxmox-backup-client.rs] Subject: [pbs-devel] [PATCH v1 proxmox-backup] add benchmark flag to backup creation for proper cleanup when running a benchmark 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: Wed, 02 Sep 2020 09:41:33 -0000 Signed-off-by: Hannes Laimer --- v1: - set worker_type to 'benchmark', if it is one - delete whole '/host/benchmark'-folder after benchmark - add optional boolean parameter 'benchmark' to backup endpoint - add backup boolean parameter to BackupWriter start() function src/api2/backup.rs | 18 ++++++++++++++---- src/bin/proxmox-backup-client.rs | 1 + src/bin/proxmox_backup_client/benchmark.rs | 1 + src/client/backup_writer.rs | 4 +++- 4 files changed, 19 insertions(+), 5 deletions(-) diff --git a/src/api2/backup.rs b/src/api2/backup.rs index ad608d85..0edc9240 100644 --- a/src/api2/backup.rs +++ b/src/api2/backup.rs @@ -38,6 +38,7 @@ pub const API_METHOD_UPGRADE_BACKUP: ApiMethod = ApiMethod::new( ("backup-id", false, &BACKUP_ID_SCHEMA), ("backup-time", false, &BACKUP_TIME_SCHEMA), ("debug", true, &BooleanSchema::new("Enable verbose debug logging.").schema()), + ("benchmark", true, &BooleanSchema::new("Is a benchmark.").schema()), ]), ) ).access( @@ -56,6 +57,7 @@ fn upgrade_to_backup_protocol( async move { let debug = param["debug"].as_bool().unwrap_or(false); + let benchmark = param["benchmark"].as_bool().unwrap_or(false); let userid: Userid = rpcenv.get_user().unwrap().parse()?; @@ -115,15 +117,19 @@ async move { let (path, is_new, _snap_guard) = datastore.create_locked_backup_dir(&backup_dir)?; if !is_new { bail!("backup directory already exists."); } - - WorkerTask::spawn("backup", Some(worker_id), userid.clone(), true, move |worker| { + let absolute_backup_dir_path = format!("{}/{}", &datastore.base_path().to_str().unwrap(), backup_group); + let mut worker_type = "backup"; + if benchmark { + worker_type = "benchmark"; + } + WorkerTask::spawn(worker_type, Some(worker_id), userid.clone(), true, move |worker| { let mut env = BackupEnvironment::new( env_type, userid, worker.clone(), datastore, backup_dir); env.debug = debug; env.last_backup = last_backup; - env.log(format!("starting new backup on datastore '{}': {:?}", store, path)); + env.log(format!("starting new {} on datastore '{}': {:?}", worker_type, store, path)); let service = H2Service::new(env.clone(), worker.clone(), &BACKUP_API_ROUTER, debug); @@ -160,7 +166,11 @@ async move { req = req_fut => req, abrt = abort_future => abrt, }; - + if benchmark { + env.log("benchmark finished successfully"); + std::fs::remove_dir_all(absolute_backup_dir_path)?; + return Ok(()); + } match (res, env.ensure_finished()) { (Ok(_), Ok(())) => { env.log("backup finished successfully"); diff --git a/src/bin/proxmox-backup-client.rs b/src/bin/proxmox-backup-client.rs index 9a6f309d..1e9cc680 100644 --- a/src/bin/proxmox-backup-client.rs +++ b/src/bin/proxmox-backup-client.rs @@ -1026,6 +1026,7 @@ async fn create_backup( &backup_id, backup_time, verbose, + false ).await?; let previous_manifest = if let Ok(previous_manifest) = client.download_previous_manifest().await { diff --git a/src/bin/proxmox_backup_client/benchmark.rs b/src/bin/proxmox_backup_client/benchmark.rs index 9355d39e..b7c67e7f 100644 --- a/src/bin/proxmox_backup_client/benchmark.rs +++ b/src/bin/proxmox_backup_client/benchmark.rs @@ -226,6 +226,7 @@ async fn test_upload_speed( "benchmark", backup_time, false, + true ).await?; if verbose { eprintln!("Start TLS speed test"); } diff --git a/src/client/backup_writer.rs b/src/client/backup_writer.rs index 35e9c0bd..64c3cf27 100644 --- a/src/client/backup_writer.rs +++ b/src/client/backup_writer.rs @@ -53,6 +53,7 @@ impl BackupWriter { backup_id: &str, backup_time: DateTime, debug: bool, + benchmark: bool ) -> Result, Error> { let param = json!({ @@ -60,7 +61,8 @@ impl BackupWriter { "backup-id": backup_id, "backup-time": backup_time.timestamp(), "store": datastore, - "debug": debug + "debug": debug, + "benchmark": benchmark }); let req = HttpClient::request_builder( -- 2.20.1