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 98F4E1FF170 for ; Thu, 29 May 2025 16:33:03 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id DF84916469; Thu, 29 May 2025 16:33:10 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 29 May 2025 16:31:56 +0200 Message-Id: <20250529143207.694497-32-c.ebner@proxmox.com> X-Mailer: git-send-email 2.39.5 In-Reply-To: <20250529143207.694497-1-c.ebner@proxmox.com> References: <20250529143207.694497-1-c.ebner@proxmox.com> MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.033 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] [RFC v2 proxmox-backup 31/42] datastore: get and set owner for S3 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" Read or write the ownership information from/to the corresponding object in the S3 object store. Keep that information available if the bucket is reused as datastore. Signed-off-by: Christian Ebner --- pbs-datastore/src/datastore.rs | 39 ++++++++++++++++++++++++++++++++++ 1 file changed, 39 insertions(+) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index d016e2139..52ec8218e 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -816,6 +816,25 @@ impl DataStore { backup_group: &pbs_api_types::BackupGroup, ) -> Result { let full_path = self.owner_path(ns, backup_group); + + if let DatastoreBackend::S3(s3_client) = self.backend()? { + let object_key = format!( + "{}/{backup_group}/owner", + ns.path() + .to_str() + .ok_or_else(|| format_err!("unexpected owner path"))?, + ); + let response = + proxmox_async::runtime::block_on(s3_client.get_object(object_key.as_str().into()))? + .ok_or_else(|| format_err!("fetching owner failed"))?; + let content = + proxmox_async::runtime::block_on(hyper::body::HttpBody::collect(response.content))?; + let owner = String::from_utf8(content.to_bytes().trim_ascii_end().to_vec())?; + return owner + .parse() + .map_err(|err| format_err!("parsing owner for {backup_group} failed: {err}")); + } + let owner = proxmox_sys::fs::file_read_firstline(full_path)?; owner .trim_end() // remove trailing newline @@ -844,6 +863,26 @@ impl DataStore { ) -> Result<(), Error> { let path = self.owner_path(ns, backup_group); + if let DatastoreBackend::S3(s3_client) = self.backend()? { + let object_key = format!( + "{}/{backup_group}/owner", + ns.path() + .to_str() + .ok_or_else(|| format_err!("unexpected owner path"))?, + ); + let data = hyper::body::Body::from(format!("{auth_id}\n")); + let response = proxmox_async::runtime::block_on( + s3_client.put_object(object_key.as_str().into(), data), + )?; + match response { + PutObjectResponse::NeedsRetry => bail!("failed to set owner, needs retry"), + PutObjectResponse::PreconditionFailed => { + bail!("failed to set owner, precondition failed") + } + PutObjectResponse::Success(_) => (), + } + } + let mut open_options = std::fs::OpenOptions::new(); open_options.write(true); -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel