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 26A3020EC88 for ; Thu, 25 Apr 2024 10:58:16 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 737E61DB24; Thu, 25 Apr 2024 10:58:22 +0200 (CEST) Mime-Version: 1.0 Date: Thu, 25 Apr 2024 10:58:20 +0200 Message-Id: To: "Wolfgang Bumiller" From: "Hannes Laimer" X-Mailer: aerc 0.17.0-78-g4ffbaa6b3946 References: <20240423083000.28002-1-h.laimer@proxmox.com> <20240423083000.28002-9-h.laimer@proxmox.com> In-Reply-To: X-SPAM-LEVEL: Spam detection results: 0 AWL 0.011 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: Re: [pbs-devel] [PATCH proxmox-backup v9 08/26] api: removable datastore creation 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 Cc: pbs-devel@lists.proxmox.com Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" On Thu Apr 25, 2024 at 10:52 AM CEST, Wolfgang Bumiller wrote: > On Wed, Apr 24, 2024 at 03:04:19PM +0200, Wolfgang Bumiller wrote: > > On Tue, Apr 23, 2024 at 10:29:42AM +0200, Hannes Laimer wrote: > > > Signed-off-by: Hannes Laimer > > > --- > > > src/api2/config/datastore.rs | 63 +++++++++++++++++++++++++++++++++--- > > > 1 file changed, 59 insertions(+), 4 deletions(-) > > > > > > diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs > > > index 87425ff5..ac1248b3 100644 > > > --- a/src/api2/config/datastore.rs > > > +++ b/src/api2/config/datastore.rs > > > @@ -8,7 +8,7 @@ use serde_json::Value; > > > use proxmox_router::{http_bail, Permission, Router, RpcEnvironment, RpcEnvironmentType}; > > > use proxmox_schema::{api, param_bail, ApiType}; > > > use proxmox_section_config::SectionConfigData; > > > -use proxmox_sys::{task_warn, WorkerTaskContext}; > > > +use proxmox_sys::{task_log, task_warn, WorkerTaskContext}; > > > use proxmox_uuid::Uuid; > > > > > > use pbs_api_types::{ > > > @@ -20,7 +20,8 @@ use pbs_config::BackupLockGuard; > > > use pbs_datastore::chunk_store::ChunkStore; > > > > > > use crate::api2::admin::{ > > > - prune::list_prune_jobs, sync::list_sync_jobs, verify::list_verification_jobs, > > > + datastore::do_mount_device, prune::list_prune_jobs, sync::list_sync_jobs, > > > + verify::list_verification_jobs, > > > }; > > > use crate::api2::config::prune::{delete_prune_job, do_create_prune_job}; > > > use crate::api2::config::sync::delete_sync_job; > > > @@ -72,13 +73,45 @@ pub(crate) fn do_create_datastore( > > > datastore: DataStoreConfig, > > > worker: Option<&dyn WorkerTaskContext>, > > > ) -> Result<(), Error> { > > > - let path: PathBuf = datastore.path.clone().into(); > > > + let mut path: PathBuf = datastore.absolute_path().into(); > > > + let backup_user = pbs_config::backup_user()?; > > > + if let Some(store_mount_point) = datastore.get_mount_point() { > > > + let default_options = proxmox_sys::fs::CreateOptions::new(); > > > + proxmox_sys::fs::create_path( > > > + store_mount_point, > > > + Some(default_options.clone()), > > > + Some(default_options.clone()), > > > + )?; > > > + do_mount_device(datastore.clone(), worker)?; > > > + > > > + let dir_opts = proxmox_sys::fs::CreateOptions::new() > > > + .owner(backup_user.uid) > > > + .group(backup_user.gid); > > > + proxmox_sys::fs::create_path( > > > + datastore.absolute_path(), > > > + Some(default_options), > > > + Some(dir_opts), > > > + )?; > > > > ^ The create_path call can be dropped, since ChunkStore::create already > > does this. > > This was probably an artefact of my testing. The call in ChunkStore > create uses root:root for the directory above the `.chunks/` dir, so we > do need this, but maybe we should instead do it inside the > ChunkStore::create method. that was the reason I added it in the first place, but the problem was I .push(".chunks") to check for existance, which modified the path. I fixed this, so the second create_path is actually not needed _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel