public inbox for pbs-devel@lists.proxmox.com
 help / color / mirror / Atom feed
From: Hannes Laimer <h.laimer@proxmox.com>
To: pbs-devel@lists.proxmox.com
Subject: [pbs-devel] [PATCH proxmox-backup v8 09/23] bin: manager: add (un)mount command
Date: Fri, 19 Apr 2024 17:55:52 +0200	[thread overview]
Message-ID: <20240419155606.112010-10-h.laimer@proxmox.com> (raw)
In-Reply-To: <20240419155606.112010-1-h.laimer@proxmox.com>

Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
---
 pbs-config/src/datastore.rs                 | 14 ++++
 src/bin/proxmox_backup_manager/datastore.rs | 76 ++++++++++++++++++++-
 2 files changed, 89 insertions(+), 1 deletion(-)

diff --git a/pbs-config/src/datastore.rs b/pbs-config/src/datastore.rs
index 5844a174..a540788f 100644
--- a/pbs-config/src/datastore.rs
+++ b/pbs-config/src/datastore.rs
@@ -63,6 +63,20 @@ pub fn complete_datastore_name(_arg: &str, _param: &HashMap<String, String>) ->
     }
 }
 
+pub fn complete_removable_datastore_name(
+    _arg: &str,
+    _param: &HashMap<String, String>,
+) -> Vec<String> {
+    match config() {
+        Ok((data, _digest)) => data
+            .sections
+            .into_iter()
+            .filter_map(|(name, (_, c))| c.get("backing-device").map(|_| name))
+            .collect(),
+        Err(_) => Vec::new(),
+    }
+}
+
 pub fn complete_acl_path(_arg: &str, _param: &HashMap<String, String>) -> Vec<String> {
     let mut list = vec![
         String::from("/"),
diff --git a/src/bin/proxmox_backup_manager/datastore.rs b/src/bin/proxmox_backup_manager/datastore.rs
index 383bcd24..f8462459 100644
--- a/src/bin/proxmox_backup_manager/datastore.rs
+++ b/src/bin/proxmox_backup_manager/datastore.rs
@@ -1,4 +1,4 @@
-use anyhow::Error;
+use anyhow::{format_err, Error};
 use serde_json::Value;
 
 use proxmox_router::{cli::*, ApiHandler, RpcEnvironment};
@@ -40,6 +40,34 @@ fn list_datastores(param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result<Valu
     Ok(Value::Null)
 }
 
+#[api(
+    protected: true,
+    input: {
+        properties: {
+            store: {
+                schema: DATASTORE_SCHEMA,
+            },
+            digest: {
+                optional: true,
+                schema: PROXMOX_CONFIG_DIGEST_SCHEMA,
+            },
+        },
+    },
+)]
+/// Mount a removable a datastore configuration.
+async fn mount_datastore(mut param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result<(), Error> {
+    param["node"] = "localhost".into();
+
+    let info = &api2::admin::datastore::API_METHOD_MOUNT;
+    let result = match info.handler {
+        ApiHandler::Sync(handler) => (handler)(param, info, rpcenv)?,
+        _ => unreachable!(),
+    };
+
+    crate::wait_for_local_worker(result.as_str().unwrap()).await?;
+    Ok(())
+}
+
 #[api(
     input: {
         properties: {
@@ -99,6 +127,34 @@ async fn create_datastore(mut param: Value) -> Result<Value, Error> {
     Ok(Value::Null)
 }
 
+#[api(
+    protected: true,
+    input: {
+        properties: {
+            store: {
+                schema: DATASTORE_SCHEMA,
+            },
+            digest: {
+                optional: true,
+                schema: PROXMOX_CONFIG_DIGEST_SCHEMA,
+            },
+        },
+    },
+)]
+/// Unmunt a removable a datastore configuration.
+async fn unmount_datastore(mut param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result<(), Error> {
+    param["node"] = "localhost".into();
+
+    let info = &api2::admin::datastore::API_METHOD_UNMOUNT;
+    let result = match info.handler {
+        ApiHandler::Async(handler) => (handler)(param, info, rpcenv).await?,
+        _ => unreachable!(),
+    };
+
+    crate::wait_for_local_worker(result.as_str().unwrap()).await?;
+    Ok(())
+}
+
 #[api(
     protected: true,
     input: {
@@ -142,6 +198,15 @@ async fn delete_datastore(mut param: Value, rpcenv: &mut dyn RpcEnvironment) ->
 pub fn datastore_commands() -> CommandLineInterface {
     let cmd_def = CliCommandMap::new()
         .insert("list", CliCommand::new(&API_METHOD_LIST_DATASTORES))
+        .insert(
+            "mount",
+            CliCommand::new(&API_METHOD_MOUNT_DATASTORE)
+                .arg_param(&["store"])
+                .completion_cb(
+                    "store",
+                    pbs_config::datastore::complete_removable_datastore_name,
+                ),
+        )
         .insert(
             "show",
             CliCommand::new(&API_METHOD_SHOW_DATASTORE)
@@ -152,6 +217,15 @@ pub fn datastore_commands() -> CommandLineInterface {
             "create",
             CliCommand::new(&API_METHOD_CREATE_DATASTORE).arg_param(&["name", "path"]),
         )
+        .insert(
+            "unmount",
+            CliCommand::new(&API_METHOD_UNMOUNT_DATASTORE)
+                .arg_param(&["store"])
+                .completion_cb(
+                    "store",
+                    pbs_config::datastore::complete_removable_datastore_name,
+                ),
+        )
         .insert(
             "update",
             CliCommand::new(&api2::config::datastore::API_METHOD_UPDATE_DATASTORE)
-- 
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-19 15:56 UTC|newest]

Thread overview: 31+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-04-19 15:55 [pbs-devel] [PATCH proxmox-backup v8 00/23] add removable datastores Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 01/23] tools: add disks utility functions Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 02/23] pbs-api-types: add backing-device to DataStoreConfig Hannes Laimer
2024-04-22  7:12   ` Thomas Lamprecht
2024-04-22  9:29     ` Dietmar Maurer
2024-04-22  9:48       ` Dietmar Maurer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 03/23] disks: add UUID to partition info Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 04/23] datastore: add helper for checking if a removable datastore is available Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 05/23] api: admin: add (un)mount endpoint for removable datastores Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 06/23] api: removable datastore creation Hannes Laimer
2024-04-22  7:28   ` Dietmar Maurer
2024-04-22  7:37     ` Hannes Laimer
2024-04-22  9:05   ` Christian Ebner
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 07/23] api: disks list: add exclude-used flag Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 08/23] pbs-api-types: add removable/is-available flag to DataStoreListItem Hannes Laimer
2024-04-19 15:55 ` Hannes Laimer [this message]
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 10/23] add auto-mounting for removable datastores Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 11/23] datastore: handle deletion of removable datastore properly Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 12/23] docs: add removable datastores section Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 13/23] ui: add partition selector form Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 14/23] ui: add removable datastore creation support Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 15/23] ui: add (un)mount button to summary Hannes Laimer
2024-04-19 15:55 ` [pbs-devel] [PATCH proxmox-backup v8 16/23] ui: tree: render unmounted datastores correctly Hannes Laimer
2024-04-19 15:56 ` [pbs-devel] [PATCH proxmox-backup v8 17/23] ui: utils: make parseMaintenanceMode more robust Hannes Laimer
2024-04-19 15:56 ` [pbs-devel] [PATCH proxmox-backup v8 18/23] ui: add datastore status mask for unmounted removable datastores Hannes Laimer
2024-04-19 15:56 ` [pbs-devel] [PATCH proxmox-backup v8 19/23] ui: maintenance: fix disable msg field if no type is selected Hannes Laimer
2024-04-19 15:56 ` [pbs-devel] [PATCH proxmox-backup v8 20/23] ui: render 'unmount' maintenance mode correctly Hannes Laimer
2024-04-19 15:56 ` [pbs-devel] [PATCH proxmox-backup v8 21/23] api: node: allow creation of removable datastore through directory endpoint Hannes Laimer
2024-04-22  9:27   ` Christian Ebner
2024-04-19 15:56 ` [pbs-devel] [PATCH proxmox-backup v8 22/23] api: node: include removable datastores in directory list Hannes Laimer
2024-04-19 15:56 ` [pbs-devel] [PATCH proxmox-backup v8 23/23] 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=20240419155606.112010-10-h.laimer@proxmox.com \
    --to=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