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 615431FF170 for ; Thu, 29 May 2025 16:32:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 4EC7C15BEE; Thu, 29 May 2025 16:32:36 +0200 (CEST) From: Christian Ebner To: pbs-devel@lists.proxmox.com Date: Thu, 29 May 2025 16:31:53 +0200 Message-Id: <20250529143207.694497-29-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 28/42] datastore: create namespace marker in S3 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" The S3 object store only allows to store objects, referenced by their key. For backup namespaces datastores however use directories, so they cannot be represented as one to one mapping. Instead, create an empty marker file for each namespace and operate based on that. Signed-off-by: Christian Ebner --- pbs-datastore/src/datastore.rs | 22 +++++++++++++++++++++- 1 file changed, 21 insertions(+), 1 deletion(-) diff --git a/pbs-datastore/src/datastore.rs b/pbs-datastore/src/datastore.rs index 42d27d249..ab5c22501 100644 --- a/pbs-datastore/src/datastore.rs +++ b/pbs-datastore/src/datastore.rs @@ -8,7 +8,7 @@ use std::time::Duration; use anyhow::{bail, format_err, Context, Error}; use nix::unistd::{unlinkat, UnlinkatFlags}; -use pbs_s3_client::{S3Client, S3ClientOptions}; +use pbs_s3_client::{PutObjectResponse, S3Client, S3ClientOptions}; use pbs_tools::lru_cache::LruCache; use tracing::{info, warn}; @@ -42,6 +42,8 @@ use crate::DataBlob; static DATASTORE_MAP: LazyLock>>> = LazyLock::new(|| Mutex::new(HashMap::new())); +const NAMESPACE_MARKER_FILENAME: &str = ".namespace"; + /// checks if auth_id is owner, or, if owner is a token, if /// auth_id is the user of the token pub fn check_backup_owner(owner: &Authid, auth_id: &Authid) -> Result<(), Error> { @@ -590,6 +592,24 @@ impl DataStore { // construct ns before mkdir to enforce max-depth and name validity let ns = BackupNamespace::from_parent_ns(parent, name)?; + if let DatastoreBackend::S3(s3_client) = self.backend()? { + let marker = ns.path().join(NAMESPACE_MARKER_FILENAME); + let namespace_marker = marker + .to_str() + .ok_or_else(|| format_err!("unexpected namespace path"))?; + + let response = proxmox_async::runtime::block_on( + s3_client.put_object(namespace_marker.into(), hyper::body::Body::empty()), + )?; + match response { + PutObjectResponse::NeedsRetry => bail!("failed to create namespace, needs retry"), + PutObjectResponse::PreconditionFailed => { + bail!("failed to create namespace, precondition failed") + } + PutObjectResponse::Success(_) => (), + } + } + let mut ns_full_path = self.base_path(); ns_full_path.push(ns.path()); -- 2.39.5 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel