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 1C3D61FF385 for ; Wed, 24 Apr 2024 15:23:27 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id EFB4D92C4; Wed, 24 Apr 2024 15:22:49 +0200 (CEST) Date: Wed, 24 Apr 2024 15:21:34 +0200 From: Wolfgang Bumiller To: Hannes Laimer Message-ID: References: <20240423083000.28002-1-h.laimer@proxmox.com> <20240423083000.28002-24-h.laimer@proxmox.com> MIME-Version: 1.0 Content-Disposition: inline In-Reply-To: <20240423083000.28002-24-h.laimer@proxmox.com> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.086 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 23/26] api: node: allow creation of removable datastore through directory endpoint 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 Tue, Apr 23, 2024 at 10:29:57AM +0200, Hannes Laimer wrote: > Signed-off-by: Hannes Laimer > --- > src/api2/node/disks/directory.rs | 64 ++++++++++++++++++++++++++++++-- > 1 file changed, 61 insertions(+), 3 deletions(-) > > diff --git a/src/api2/node/disks/directory.rs b/src/api2/node/disks/directory.rs > index 73af92cc..34304216 100644 > --- a/src/api2/node/disks/directory.rs > +++ b/src/api2/node/disks/directory.rs > @@ -123,6 +123,11 @@ pub fn list_datastore_mounts() -> Result, Error> { > type: bool, > optional: true, Add a `default: false` here. > }, > + "removable-datastore": { > + description: "The the added datastore is removable.", > + type: bool, > + optional: true, and here > + }, > filesystem: { > type: FileSystemType, > optional: true, > @@ -141,6 +146,7 @@ pub fn create_datastore_disk( > name: String, > disk: String, > add_datastore: Option, > + removable_datastore: Option, ^ Turn both above `Option` into just `bool`. > filesystem: Option, > rpcenv: &mut dyn RpcEnvironment, > ) -> Result { > @@ -154,8 +160,59 @@ pub fn create_datastore_disk( > bail!("disk '{}' is already in use.", disk); > } > > - let mount_point = format!("{}{}", BASE_MOUNT_DIR, &name); > + if let (Some(true), Some(true)) = (add_datastore, removable_datastore) { ^ Then this can just be if add_datastore && removable_datastore { which is much nicer to read. > + let upid_str = WorkerTask::new_thread( > + "dircreate", > + Some(name.clone()), > + auth_id, > + to_stdout, > + move |worker| { > + task_log!( > + worker, > + "create removable datastore '{}' on disk {}", > + name, > + disk > + ); > + > + let filesystem = filesystem.unwrap_or(FileSystemType::Ext4); > + > + let manager = DiskManage::new(); > + > + let disk = manager.disk_by_name(&disk)?; > + > + let partition = create_single_linux_partition(&disk)?; > + create_file_system(&partition, filesystem)?; > + > + let uuid = get_fs_uuid(&partition)?; ^ Up to here this is absically copied from the non-removable part below. IMO this could could be shared better and only the part below then diverge via `if removable_datastore {}`. > + > + let lock = pbs_config::datastore::lock_config()?; > + let datastore: DataStoreConfig = serde_json::from_value( > + json!({ "name": name, "path": name, "backing-device": uuid }), > + )?; > + > + let (config, _digest) = pbs_config::datastore::config()?; > + > + if config.sections.get(&datastore.name).is_some() { > + bail!("datastore '{}' already exists.", datastore.name); > + } > + > + // we don't have to check if the UUID is already in use since we just created the > + // fs ourself > > + crate::api2::config::datastore::do_create_datastore( > + lock, > + config, > + datastore, > + Some(&worker), > + )?; > + > + Ok(()) > + }, > + )?; > + return Ok(upid_str); > + }; > + > + let mount_point = format!("{}{}", BASE_MOUNT_DIR, &name); > // check if the default path exists already. > // bail if it is not empty or another filesystem mounted on top > let default_path = std::path::PathBuf::from(&mount_point); > @@ -250,8 +307,9 @@ pub fn delete_datastore_disk(name: String) -> Result<(), Error> { > // path of datastore cannot be changed > let (config, _) = pbs_config::datastore::config()?; > let datastores: Vec = config.convert_to_typed_array("datastore")?; > - let conflicting_datastore: Option = > - datastores.into_iter().find(|ds| ds.absolute_path() == path); > + let conflicting_datastore: Option = datastores.into_iter().find(|ds| { > + ds.absolute_path() == path || ds.get_mount_point().map_or(false, |mp| mp == path) > + }); > > if let Some(conflicting_datastore) = conflicting_datastore { > bail!( > -- > 2.39.2 _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel