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 346991FF165 for ; Thu, 3 Jul 2025 15:19:52 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 41083149D8; Thu, 3 Jul 2025 15:20:16 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 3 Jul 2025 15:18:09 +0200 Message-ID: <20250703131837.786811-22-c.ebner@proxmox.com> X-Mailer: git-send-email 2.47.2 In-Reply-To: <20250703131837.786811-1-c.ebner@proxmox.com> References: <20250703131837.786811-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.040 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 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 v5 18/46] api: backup: conditionally upload blobs to s3 object store backend 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" Upload blobs to both, the local datastore cache and the S3 object store if s3 is configured as backend. Signed-off-by: Christian Ebner --- src/api2/backup/environment.rs | 17 +++++++++++++++++ 1 file changed, 17 insertions(+) diff --git a/src/api2/backup/environment.rs b/src/api2/backup/environment.rs index 7bd86f39c..dbf0ebccf 100644 --- a/src/api2/backup/environment.rs +++ b/src/api2/backup/environment.rs @@ -581,6 +581,23 @@ impl BackupEnvironment { let blob = DataBlob::load_from_reader(&mut &data[..])?; let raw_data = blob.raw_data(); + if let DatastoreBackend::S3(s3_client) = &self.backend { + let mut object_key = self.backup_dir.relative_path(); + object_key.push(file_name); + let object_key = object_key + .as_os_str() + .to_str() + .ok_or_else(|| format_err!("invalid path"))?; + let data = hyper::body::Bytes::copy_from_slice(raw_data); + proxmox_async::runtime::block_on(s3_client.upload_with_retry( + object_key.into(), + data, + true, + )) + .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.log(format!( -- 2.47.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel