Re: [pbs-devel] [PATCH proxmox-backup 5/7] bin: manager: run uuid_mount/mount tasks on the proxy

[Christian Ebner <c.ebner@proxmox.com>]

comments inline

On 1/16/25 07:45, Hannes Laimer wrote:
> Use the API instead of running uuid_mount/mount directly in the CLI binary.
> This ensures that all triggered tasks are handled by the proxy process.
> 
> Signed-off-by: Hannes Laimer <h.laimer@proxmox.com>
> ---
>   src/bin/proxmox_backup_manager/datastore.rs | 42 +++++++++++++--------
>   1 file changed, 27 insertions(+), 15 deletions(-)
> 
> diff --git a/src/bin/proxmox_backup_manager/datastore.rs b/src/bin/proxmox_backup_manager/datastore.rs
> index 1922a55a2..50a07c03a 100644
> --- a/src/bin/proxmox_backup_manager/datastore.rs
> +++ b/src/bin/proxmox_backup_manager/datastore.rs
> @@ -49,24 +49,31 @@ fn list_datastores(param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result<Valu
>               store: {
>                   schema: DATASTORE_SCHEMA,
>               },
> -            digest: {

Why is digest removed here? This parameter should stay as otherwise it 
is a breaking api change. If this has to be removed, the reason should 
be mentioned in the commit message.

> +            "output-format": {
> +                schema: OUTPUT_FORMAT,
>                   optional: true,
> -                schema: PROXMOX_CONFIG_DIGEST_SCHEMA,
>               },
>           },
>       },
>   )]
>   /// Mount a removable datastore.
> -async fn mount_datastore(mut param: Value, rpcenv: &mut dyn RpcEnvironment) -> Result<(), Error> {
> -    param["node"] = "localhost".into();
> +async fn mount_datastore(
> +    store: String,
> +    mut param: Value,
> +    _rpcenv: &mut dyn RpcEnvironment,
> +) -> Result<(), Error> {
> +    let output_format = extract_output_format(&mut param);
>   
> -    let info = &api2::admin::datastore::API_METHOD_MOUNT;
> -    let result = match info.handler {
> -        ApiHandler::Sync(handler) => (handler)(param, info, rpcenv)?,
> -        _ => unreachable!(),
> -    };
> +    let client = connect_to_localhost()?;
> +    let result = client
> +        .post(
> +            format!("api2/json/admin/datastore/{}/mount", store).as_str(),

nit: store can be in-lined into the format string

> +            None,
> +        )
> +        .await?;
> +
> +    view_task_result(&client, result, &output_format).await?;
>   
> -    crate::wait_for_local_worker(result.as_str().unwrap()).await?;
>       Ok(())
>   }
>   
> @@ -252,10 +259,6 @@ async fn update_datastore(name: String, mut param: Value) -> Result<(), Error> {
>                   type: String,
>                   description: "The UUID of the device that should be mounted",
>               },
> -            "output-format": {

Breaking change, can be avoided?

> -                schema: OUTPUT_FORMAT,
> -                optional: true,
> -            },
>           },
>       },
>   )]
> @@ -282,7 +285,16 @@ async fn uuid_mount(param: Value, _rpcenv: &mut dyn RpcEnvironment) -> Result<Va
>       }
>   
>       if let Some(store) = matching_stores.first() {
> -        api2::admin::datastore::do_mount_device(store.clone())?;
> +        let client = connect_to_localhost()?;
> +        let result = client
> +            .post(
> +                format!("api2/json/admin/datastore/{}/mount", store.name).as_str(),
> +                None,
> +            )
> +            .await?;
> +
> +        view_task_result(&client, result, "json").await?;

this could get the output format as obtained via the get_output_format 
helper instead of being json only? Analog to the other api endpoints.

> +        return Ok(Value::Null);
>       }
>   
>       // we don't want to fail for UUIDs that are not associated with datastores, as that produces



_______________________________________________
pbs-devel mailing list
pbs-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pbs-devel