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 C8A411FF168 for ; Mon, 14 Oct 2024 15:42:28 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 0943B36146; Mon, 14 Oct 2024 15:43:00 +0200 (CEST) Date: Mon, 14 Oct 2024 15:42:54 +0200 From: Fabian =?iso-8859-1?q?Gr=FCnbichler?= To: Proxmox Backup Server development discussion References: <20240904141155.350454-1-h.laimer@proxmox.com> <20240904141155.350454-12-h.laimer@proxmox.com> In-Reply-To: <20240904141155.350454-12-h.laimer@proxmox.com> MIME-Version: 1.0 User-Agent: astroid/0.16.0 (https://github.com/astroidmail/astroid) Message-Id: <1728910495.gtwf1rxw2w.astroid@yuna.none> X-SPAM-LEVEL: Spam detection results: 0 AWL 0.049 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 v12 11/26] bin: manager: add (un)mount command 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-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pbs-devel-bounces@lists.proxmox.com Sender: "pbs-devel" On September 4, 2024 4:11 pm, Hannes Laimer wrote: > Signed-off-by: Hannes Laimer > --- > 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 dc5bb3da..396dcb37 100644 > --- a/pbs-config/src/datastore.rs > +++ b/pbs-config/src/datastore.rs > @@ -62,6 +62,20 @@ pub fn complete_datastore_name(_arg: &str, _param: &HashMap) -> > } > } > > +pub fn complete_removable_datastore_name( > + _arg: &str, > + _param: &HashMap, > +) -> Vec { > + match config() { > + Ok((data, _digest)) => data > + .sections > + .into_iter() > + .filter_map(|(name, (_, c))| c.get("backing-device").map(|_| name)) nit: I'd prefer `.and(Some(name))`` instead of mapping just to throw the value away > + .collect(), > + Err(_) => Vec::new(), > + } > +} > + > pub fn complete_acl_path(_arg: &str, _param: &HashMap) -> Vec { > 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..f2795b39 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 Ok(Value::Null) > } > > +#[api( > + protected: true, > + input: { > + properties: { > + store: { > + schema: DATASTORE_SCHEMA, > + }, > + digest: { > + optional: true, > + schema: PROXMOX_CONFIG_DIGEST_SCHEMA, > + }, > + }, > + }, > +)] > +/// Mount a removable datastore. > +async fn mount_datastore(mut param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result<(), Error> { why can't this just delegate directly to the API endpoint? (if there is a reason, it would be nice to mention such things in the commit message..) > + 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 { > Ok(Value::Null) > } > > +#[api( > + protected: true, > + input: { > + properties: { > + store: { > + schema: DATASTORE_SCHEMA, > + }, > + digest: { > + optional: true, > + schema: PROXMOX_CONFIG_DIGEST_SCHEMA, > + }, > + }, > + }, > +)] > +/// Unmount a removable datastore. > +async fn unmount_datastore(mut param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result<(), Error> { same question here? > + 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 > > > _______________________________________________ pbs-devel mailing list pbs-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel