From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits) server-digest SHA256) (No client certificate requested) by lists.proxmox.com (Postfix) with ESMTPS id 2EBA596465 for ; Mon, 15 Apr 2024 18:03:33 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 11D27E7A3 for ; Mon, 15 Apr 2024 18:03:03 +0200 (CEST) Received: from proxmox-new.maurer-it.com (proxmox-new.maurer-it.com [94.136.29.106]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (2048 bits)) (No client certificate requested) by firstgate.proxmox.com (Proxmox) with ESMTPS for ; Mon, 15 Apr 2024 18:02:57 +0200 (CEST) Received: from proxmox-new.maurer-it.com (localhost.localdomain [127.0.0.1]) by proxmox-new.maurer-it.com (Proxmox) with ESMTP id 9A0F144C49 for ; Mon, 15 Apr 2024 18:02:57 +0200 (CEST) Message-ID: Date: Mon, 15 Apr 2024 18:02:51 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Proxmox Backup Server development discussion , Hannes Laimer References: <20240409110012.166472-1-h.laimer@proxmox.com> <20240409110012.166472-8-h.laimer@proxmox.com> Content-Language: en-US, de-DE From: Christian Ebner In-Reply-To: <20240409110012.166472-8-h.laimer@proxmox.com> Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 7bit X-SPAM-LEVEL: Spam detection results: 0 AWL 0.030 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 v3 07/24] api2: 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: , X-List-Received-Date: Mon, 15 Apr 2024 16:03:33 -0000 On 4/9/24 12:59, Hannes Laimer wrote: > Signed-off-by: Hannes Laimer > --- > src/api2/config/datastore.rs | 52 ++++++++++++++++++++++++++++++++++-- > 1 file changed, 50 insertions(+), 2 deletions(-) > > diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs > index 3081e1f4..0194d7d4 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,6 +73,31 @@ pub(crate) fn do_create_datastore( > datastore: DataStoreConfig, > worker: Option<&dyn WorkerTaskContext>, > ) -> Result<(), Error> { > + if datastore.backing_device.is_some() { > + let mut mount_point: PathBuf = PathBuf::from(&datastore.path); There is no need for the additional type annotation, the type is already given by the return type of the `PathBuf::from()`. > + > + let default_options = proxmox_sys::fs::CreateOptions::new(); > + proxmox_sys::fs::create_path( > + &mount_point, > + Some(default_options.clone()), > + Some(default_options), > + )?; > + do_mount_device(None, config.clone(), datastore.clone(), worker)?; > + > + mount_point.push(".chunks"); > + if mount_point.is_dir() { > + config.set_data(&datastore.name, "datastore", &datastore)?; > + pbs_config::datastore::save_config(&config)?; > + if let Some(worker) = worker { > + task_log!( > + worker, > + "created removable datastore, chunkstore already exists" > + ); > + return Ok(()); > + } > + } If `.chunks` already exists on the mounted datastore, but it is not a directory, then I guess something is off. Can and should this be handled early, or is this already fully covered by the `ChunkStore::create` call later on? > + } > + > let path: PathBuf = datastore.path.clone().into(); > > let tuning: DatastoreTuning = serde_json::from_value( > @@ -122,6 +148,28 @@ pub fn create_datastore( > param_bail!("name", "datastore '{}' already exists.", config.name); > } > > + if let Some(uuid) = &config.backing_device { > + let already_used_by = section_config > + .sections > + .iter() > + .flat_map(|(datastore_name, (_, config))| { > + config > + .as_object() > + .and_then(|cfg| cfg.get("backing-device")) > + .and_then(|backing_device| backing_device.as_str()) > + .filter(|&device_uuid| device_uuid == uuid) > + .map(|_| datastore_name) > + }) > + .next(); > + > + if let Some(datastore_name) = already_used_by { > + param_bail!( > + "backing-device", > + "device already in use by datastore '{datastore_name}'", > + ); > + } > + } > + > let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; > let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI; >