From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 0100D1FF183 for ; Wed, 5 Nov 2025 13:22:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id D6864225FA; Wed, 5 Nov 2025 13:23:36 +0100 (CET) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Wed, 5 Nov 2025 13:22:15 +0100 Message-ID: <20251105122233.439382-6-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251105122233.439382-1-c.ebner@proxmox.com> References: <20251105122233.439382-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1762345365195 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.047 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_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. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pbs-devel] [PATCH proxmox-backup v3 05/23] api: backup: use datastore add_blob helper for backup session 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" Deduplicates the blob upload logic by using the new helper and reuses the backend instance stored in the environment. Signed-off-by: Christian Ebner --- changes since version 2: - no changes src/api2/backup/environment.rs | 21 ++------------------- 1 file changed, 2 insertions(+), 19 deletions(-) diff --git a/src/api2/backup/environment.rs b/src/api2/backup/environment.rs index 0e8eab1be..0faf6c8e0 100644 --- a/src/api2/backup/environment.rs +++ b/src/api2/backup/environment.rs @@ -11,7 +11,6 @@ use serde_json::{json, Value}; use proxmox_http::Body; use proxmox_router::{RpcEnvironment, RpcEnvironmentType}; -use proxmox_sys::fs::{replace_file, CreateOptions}; use pbs_api_types::Authid; use pbs_datastore::backup_info::{BackupDir, BackupInfo}; @@ -686,24 +685,8 @@ impl BackupEnvironment { // always verify blob/CRC at server side let blob = DataBlob::load_from_reader(&mut &data[..])?; - - let raw_data = blob.raw_data(); - if let DatastoreBackend::S3(s3_client) = &self.backend { - let object_key = pbs_datastore::s3::object_key_from_path( - &self.backup_dir.relative_path(), - file_name, - ) - .context("invalid blob object key")?; - let data = hyper::body::Bytes::copy_from_slice(raw_data); - proxmox_async::runtime::block_on( - s3_client.upload_replace_with_retry(object_key.clone(), data), - ) - .context("failed to upload blob to s3 backend")?; - self.log(format!("Uploaded blob to object store: {object_key}")) - } - - replace_file(&path, raw_data, CreateOptions::new(), false)?; - + self.datastore + .add_blob(file_name, self.backup_dir.clone(), blob, &self.backend)?; self.log(format!( "add blob {path:?} ({orig_len} bytes, comp: {blob_len})" )); -- 2.47.3 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel