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 D63261FF16F for ; Tue, 22 Jul 2025 12:16:16 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id F258636554; Tue, 22 Jul 2025 12:17:31 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Tue, 22 Jul 2025 12:10:54 +0200 Message-ID: <20250722101106.526438-39-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250722101106.526438-1-c.ebner@proxmox.com> References: <20250722101106.526438-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1753179086604 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.044 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. [push.rs, benchmark.rs, main.rs, upload-speed.rs] Subject: [pbs-devel] [PATCH proxmox-backup v11 34/46] backup writer: refactor parameters into backup writer options struct 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" Introduce a BackupWriterOptions struct, bundling the currently present writer start parameters n order to limit their number and make this easier extensible. No functional changes intended. Signed-off-by: Christian Ebner Lukas Wagner Reviewed-by: Hannes Laimer --- changes since version 10: - no changes examples/upload-speed.rs | 16 ++++++---- pbs-client/src/backup_writer.rs | 44 ++++++++++++++++---------- proxmox-backup-client/src/benchmark.rs | 16 ++++++---- proxmox-backup-client/src/main.rs | 18 ++++++----- src/server/push.rs | 18 +++++++---- 5 files changed, 66 insertions(+), 46 deletions(-) diff --git a/examples/upload-speed.rs b/examples/upload-speed.rs index e4b570ec5..bbabb37df 100644 --- a/examples/upload-speed.rs +++ b/examples/upload-speed.rs @@ -1,7 +1,7 @@ use anyhow::Error; use pbs_api_types::{Authid, BackupNamespace, BackupType}; -use pbs_client::{BackupWriter, HttpClient, HttpClientOptions}; +use pbs_client::{BackupWriter, BackupWriterOptions, HttpClient, HttpClientOptions}; async fn upload_speed() -> Result { let host = "localhost"; @@ -19,12 +19,14 @@ async fn upload_speed() -> Result { let client = BackupWriter::start( &client, - None, - datastore, - &BackupNamespace::root(), - &(BackupType::Host, "speedtest".to_string(), backup_time).into(), - false, - true, + BackupWriterOptions { + datastore, + ns: &BackupNamespace::root(), + backup: &(BackupType::Host, "speedtest".to_string(), backup_time).into(), + crypt_config: None, + debug: false, + benchmark: true, + }, ) .await?; diff --git a/pbs-client/src/backup_writer.rs b/pbs-client/src/backup_writer.rs index 1253ef561..853b1cb4f 100644 --- a/pbs-client/src/backup_writer.rs +++ b/pbs-client/src/backup_writer.rs @@ -63,6 +63,22 @@ struct ChunkUploadResponse { type UploadQueueSender = mpsc::Sender<(MergedChunkInfo, Option)>; type UploadResultReceiver = oneshot::Receiver>; +/// Additional configuration options for BackupWriter instance +pub struct BackupWriterOptions<'a> { + /// Target datastore + pub datastore: &'a str, + /// Target namespace + pub ns: &'a BackupNamespace, + /// Target snapshot + pub backup: &'a BackupDir, + /// Crypto configuration + pub crypt_config: Option>, + /// Run in debug mode + pub debug: bool, + /// Start benchmark + pub benchmark: bool, +} + impl BackupWriter { fn new(h2: H2Client, abort: AbortHandle, crypt_config: Option>) -> Arc { Arc::new(Self { @@ -72,28 +88,22 @@ impl BackupWriter { }) } - // FIXME: extract into (flattened) parameter struct? #[allow(clippy::too_many_arguments)] - pub async fn start( + pub async fn start<'a>( client: &HttpClient, - crypt_config: Option>, - datastore: &str, - ns: &BackupNamespace, - backup: &BackupDir, - debug: bool, - benchmark: bool, + writer_options: BackupWriterOptions<'a>, ) -> Result, Error> { let mut param = json!({ - "backup-type": backup.ty(), - "backup-id": backup.id(), - "backup-time": backup.time, - "store": datastore, - "debug": debug, - "benchmark": benchmark + "backup-type": writer_options.backup.ty(), + "backup-id": writer_options.backup.id(), + "backup-time": writer_options.backup.time, + "store": writer_options.datastore, + "debug": writer_options.debug, + "benchmark": writer_options.benchmark, }); - if !ns.is_root() { - param["ns"] = serde_json::to_value(ns)?; + if !writer_options.ns.is_root() { + param["ns"] = serde_json::to_value(writer_options.ns)?; } let req = HttpClient::request_builder( @@ -109,7 +119,7 @@ impl BackupWriter { .start_h2_connection(req, String::from(PROXMOX_BACKUP_PROTOCOL_ID_V1!())) .await?; - Ok(BackupWriter::new(h2, abort, crypt_config)) + Ok(BackupWriter::new(h2, abort, writer_options.crypt_config)) } pub async fn get(&self, path: &str, param: Option) -> Result { diff --git a/proxmox-backup-client/src/benchmark.rs b/proxmox-backup-client/src/benchmark.rs index a6f24d745..6b11e216d 100644 --- a/proxmox-backup-client/src/benchmark.rs +++ b/proxmox-backup-client/src/benchmark.rs @@ -16,7 +16,7 @@ use proxmox_schema::{api, ApiType, ReturnType}; use pbs_api_types::{BackupNamespace, BackupType}; use pbs_client::tools::key_source::get_encryption_key_password; -use pbs_client::{BackupRepository, BackupWriter}; +use pbs_client::{BackupRepository, BackupWriter, BackupWriterOptions}; use pbs_datastore::data_blob::{DataBlob, DataChunkBuilder}; use pbs_key_config::{load_and_decrypt_key, KeyDerivationConfig}; use pbs_tools::crypt_config::CryptConfig; @@ -230,12 +230,14 @@ async fn test_upload_speed( log::debug!("Connecting to backup server"); let client = BackupWriter::start( &client, - crypt_config.clone(), - repo.store(), - &BackupNamespace::root(), - &(BackupType::Host, "benchmark".to_string(), backup_time).into(), - false, - true, + BackupWriterOptions { + datastore: repo.store(), + ns: &BackupNamespace::root(), + backup: &(BackupType::Host, "benchmark".to_string(), backup_time).into(), + crypt_config: crypt_config.clone(), + debug: false, + benchmark: true, + }, ) .await?; diff --git a/proxmox-backup-client/src/main.rs b/proxmox-backup-client/src/main.rs index 44f4f5db5..44c076627 100644 --- a/proxmox-backup-client/src/main.rs +++ b/proxmox-backup-client/src/main.rs @@ -46,8 +46,8 @@ use pbs_client::tools::{ use pbs_client::{ delete_ticket_info, parse_backup_specification, view_task_result, BackupDetectionMode, BackupReader, BackupRepository, BackupSpecificationType, BackupStats, BackupWriter, - ChunkStream, FixedChunkStream, HttpClient, InjectionData, PxarBackupStream, RemoteChunkReader, - UploadOptions, BACKUP_SOURCE_SCHEMA, + BackupWriterOptions, ChunkStream, FixedChunkStream, HttpClient, InjectionData, + PxarBackupStream, RemoteChunkReader, UploadOptions, BACKUP_SOURCE_SCHEMA, }; use pbs_datastore::catalog::{BackupCatalogWriter, CatalogReader, CatalogWriter}; use pbs_datastore::chunk_store::verify_chunk_size; @@ -954,12 +954,14 @@ async fn create_backup( let client = BackupWriter::start( &http_client, - crypt_config.clone(), - repo.store(), - &backup_ns, - &snapshot, - true, - false, + BackupWriterOptions { + datastore: repo.store(), + ns: &backup_ns, + backup: &snapshot, + crypt_config: crypt_config.clone(), + debug: true, + benchmark: false, + }, ) .await?; diff --git a/src/server/push.rs b/src/server/push.rs index 528eed9ff..c78063662 100644 --- a/src/server/push.rs +++ b/src/server/push.rs @@ -16,7 +16,9 @@ use pbs_api_types::{ MANIFEST_BLOB_NAME, PRIV_DATASTORE_BACKUP, PRIV_DATASTORE_READ, PRIV_REMOTE_DATASTORE_BACKUP, PRIV_REMOTE_DATASTORE_MODIFY, PRIV_REMOTE_DATASTORE_PRUNE, }; -use pbs_client::{BackupRepository, BackupWriter, HttpClient, MergedChunkInfo, UploadOptions}; +use pbs_client::{ + BackupRepository, BackupWriter, BackupWriterOptions, HttpClient, MergedChunkInfo, UploadOptions, +}; use pbs_config::CachedUserInfo; use pbs_datastore::data_blob::ChunkInfo; use pbs_datastore::dynamic_index::DynamicIndexReader; @@ -822,12 +824,14 @@ pub(crate) async fn push_snapshot( // Writer instance locks the snapshot on the remote side let backup_writer = BackupWriter::start( ¶ms.target.client, - None, - params.target.repo.store(), - &target_ns, - snapshot, - false, - false, + BackupWriterOptions { + datastore: params.target.repo.store(), + ns: &target_ns, + backup: snapshot, + crypt_config: None, + debug: false, + benchmark: false, + }, ) .await?; -- 2.47.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel