public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Wolfgang Bumiller <w.bumiller@proxmox.com>
To: Hannes Laimer <h.laimer@proxmox.com>
Cc: pbs-devel@lists.proxmox.com
Subject: Re: [pbs-devel] [PATCH proxmox-backup v9 23/26] api: node: allow creation of removable datastore through directory endpoint
Date: Wed, 24 Apr 2024 15:21:34 +0200	[thread overview]
Message-ID: <tstf7q4r753cy3vs34lgnsrwkozu6zidwe3uecpawmwue73yr4@6ehpuicsqo7k> (raw)
In-Reply-To: <20240423083000.28002-24-h.laimer@proxmox.com>

On Tue, Apr 23, 2024 at 10:29:57AM +0200, Hannes Laimer wrote:
> Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
> ---
>  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<Vec<DatastoreMountInfo>, 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<bool>,
> +    removable_datastore: Option<bool>,

^ Turn both above `Option<bool>` into just `bool`.

>      filesystem: Option<FileSystemType>,
>      rpcenv: &mut dyn RpcEnvironment,
>  ) -> Result<String, Error> {
> @@ -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<DataStoreConfig> = config.convert_to_typed_array("datastore")?;
> -    let conflicting_datastore: Option<DataStoreConfig> =
> -        datastores.into_iter().find(|ds| ds.absolute_path() == path);
> +    let conflicting_datastore: Option<DataStoreConfig> = 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


  parent reply	other threads:[~2024-04-24 13:23 UTC|newest]

Thread overview: 47+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-23  8:29 [pbs-devel] [PATCH proxmox-backup v9 00/26] add removable datastores Hannes Laimer
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 01/26] tools: add disks utility functions Hannes Laimer
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 02/26] config: factor out method to get the absolute datastore path Hannes Laimer
2024-04-24 13:26   ` Wolfgang Bumiller
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 03/26] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 04/26] maintenance: add 'Unmount' maintenance type Hannes Laimer
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 05/26] disks: add UUID to partition info Hannes Laimer
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 06/26] datastore: add helper for checking if a removable datastore is available Hannes Laimer
2024-04-24 11:16   ` Gabriel Goller
2024-04-24 13:30   ` Wolfgang Bumiller
2024-04-25  6:05     ` Hannes Laimer
2024-04-25  7:19       ` Wolfgang Bumiller
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 07/26] api: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 08/26] api: removable datastore creation Hannes Laimer
2024-04-24 13:04   ` Wolfgang Bumiller
2024-04-25  8:52     ` Wolfgang Bumiller
2024-04-25  8:58       ` Hannes Laimer
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 09/26] api: disks list: add exclude-used flag Hannes Laimer
2024-04-24 13:09   ` Wolfgang Bumiller
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 10/26] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2024-04-24 13:13   ` Wolfgang Bumiller
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 11/26] bin: manager: add (un)mount command Hannes Laimer
2024-04-24 11:25   ` Gabriel Goller
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 12/26] add auto-mounting for removable datastores Hannes Laimer
2024-04-24 13:18   ` Wolfgang Bumiller
2024-04-25  5:32     ` Hannes Laimer
2024-04-25  5:34       ` Hannes Laimer
2024-04-24 13:35   ` Wolfgang Bumiller
2024-04-25  4:59     ` Hannes Laimer
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 13/26] datastore: handle deletion of removable datastore properly Hannes Laimer
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 14/26] docs: add removable datastores section Hannes Laimer
2024-04-24 11:53   ` Gabriel Goller
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 15/26] ui: add partition selector form Hannes Laimer
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 16/26] ui: add removable datastore creation support Hannes Laimer
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 17/26] ui: add (un)mount button to summary Hannes Laimer
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 18/26] ui: tree: render unmounted datastores correctly Hannes Laimer
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 19/26] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 20/26] ui: add datastore status mask for unmounted removable datastores Hannes Laimer
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 21/26] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 22/26] ui: render 'unmount' maintenance mode correctly Hannes Laimer
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 23/26] api: node: allow creation of removable datastore through directory endpoint Hannes Laimer
2024-04-24 11:56   ` Gabriel Goller
2024-04-24 13:21   ` Wolfgang Bumiller [this message]
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 24/26] api: node: include removable datastores in directory list Hannes Laimer
2024-04-24 13:06   ` Wolfgang Bumiller
2024-04-23  8:29 ` [pbs-devel] [PATCH proxmox-backup v9 25/26] node: disks: replace BASE_MOUNT_DIR with DATASTORE_MOUNT_DIR Hannes Laimer
2024-04-23  8:30 ` [pbs-devel] [PATCH proxmox-backup v9 26/26] ui: support create removable datastore through directory creation Hannes Laimer

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=tstf7q4r753cy3vs34lgnsrwkozu6zidwe3uecpawmwue73yr4@6ehpuicsqo7k \
    --to=w.bumiller@proxmox.com \
    --cc=h.laimer@proxmox.com \
    --cc=pbs-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal