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 68C9A1FF56B for ; Mon, 22 Apr 2024 11:05:43 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 50EE7C3C1; Mon, 22 Apr 2024 11:05:47 +0200 (CEST) Message-ID: Date: Mon, 22 Apr 2024 11:05:37 +0200 MIME-Version: 1.0 User-Agent: Mozilla Thunderbird To: Proxmox Backup Server development discussion , Hannes Laimer References: <20240419155606.112010-1-h.laimer@proxmox.com> <20240419155606.112010-7-h.laimer@proxmox.com> Content-Language: en-US, de-DE From: Christian Ebner In-Reply-To: <20240419155606.112010-7-h.laimer@proxmox.com> X-SPAM-LEVEL: Spam detection results: 1 AWL -0.019 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 FSL_BULK_SIG 0.001 Bulk signature with no Unsubscribe KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment RAZOR2_CF_RANGE_51_100 1.886 Razor2 gives confidence level above 50% RAZOR2_CHECK 0.922 Listed in Razor2 (http://razor.sf.net/) SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record URIBL_SBL_A 0.1 Contains URL's A record listed in the Spamhaus SBL blocklist [185.199.111.153, 185.199.108.153, 185.199.109.153, 185.199.110.153] Subject: Re: [pbs-devel] [PATCH proxmox-backup v8 06/23] 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 Content-Transfer-Encoding: 7bit Content-Type: text/plain; charset="us-ascii"; Format="flowed" Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" On 4/19/24 17:55, Hannes Laimer wrote: > Signed-off-by: Hannes Laimer > --- > src/api2/config/datastore.rs | 58 ++++++++++++++++++++++++++++++++++-- > 1 file changed, 55 insertions(+), 3 deletions(-) > > diff --git a/src/api2/config/datastore.rs b/src/api2/config/datastore.rs > index 87425ff5..b021b5f0 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,32 @@ pub(crate) fn do_create_datastore( > datastore: DataStoreConfig, > worker: Option<&dyn WorkerTaskContext>, > ) -> Result<(), Error> { > + if let Some(store_mount_point) = datastore.get_mount_point() { > + let mut store_path = PathBuf::from(&datastore.path); > + > + let default_options = proxmox_sys::fs::CreateOptions::new(); > + proxmox_sys::fs::create_path( > + &store_mount_point, Please remove the reference here, otherwise clippy complains: ``` warning: the borrowed expression implements the required traits --> src/api2/config/datastore.rs:83:13 | 83 | &store_mount_point, | ^^^^^^^^^^^^^^^^^^ help: change this to: `store_mount_point` | = help: for further information visit https://rust-lang.github.io/rust-clippy/master/index.html#needless_borrow = note: `#[warn(clippy::needless_borrow)]` on by default ``` > + Some(default_options.clone()), > + Some(default_options), > + )?; > + do_mount_device(datastore.clone(), worker)?; > + > + store_path.push(".chunks"); > + if store_path.is_dir() { > + config.set_data(&datastore.name, "datastore", &datastore)?; > + pbs_config::datastore::save_config(&config)?; > + jobstate::create_state_file("garbage_collection", &datastore.name)?; > + if let Some(worker) = worker { > + task_log!( > + worker, > + "created removable datastore, chunkstore already exists" > + ); > + } > + return Ok(()); > + } > + } > + > let path: PathBuf = datastore.path.clone().into(); > > let tuning: DatastoreTuning = serde_json::from_value( > @@ -111,7 +138,7 @@ pub(crate) fn do_create_datastore( > )] > /// Create new datastore config. > pub fn create_datastore( > - config: DataStoreConfig, > + mut config: DataStoreConfig, > rpcenv: &mut dyn RpcEnvironment, > ) -> Result { > let lock = pbs_config::datastore::lock_config()?; > @@ -122,6 +149,31 @@ 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}'", > + ); > + } > + if let Some(mount_point) = config.get_mount_point() { > + config.path = format!("{mount_point}/{}", config.path.trim_start_matches('/')); > + } > + } > + > let auth_id: Authid = rpcenv.get_auth_id().unwrap().parse()?; > let to_stdout = rpcenv.env_type() == RpcEnvironmentType::CLI; > _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel