Re: [PATCH datacenter-manager v2 1/4] cli: admin: make cli handling async

["Lukas Wagner" <l.wagner@proxmox.com>]

Hi Shan,

some comments inline.

On Tue Feb 3, 2026 at 6:50 PM CET, Shan Shaji wrote:
> The acme API methods internally create workers to process API requests.
> An error was thrown if the methods invoked without initializing the
> worker tasks.
>
> Since `init_worker_tasks` needs to be called from an async runtime.
> Moved the content of the main function to async `run` function and
> wrapped using `proxmox_async::runtime::main`, which creates a Tokio
> runtime.
>
> Signed-off-by: Shan Shaji <s.shaji@proxmox.com>
> ---
>  changes since v1:
>  - use `tasklog` function to capture worker task logs to the tasklog
>    file. 
>  - add `context` method to preserve the error messages. 
>
>  cli/admin/Cargo.toml  |  3 +++
>  cli/admin/src/main.rs | 53 ++++++++++++++++++++++++++++---------------
>  2 files changed, 38 insertions(+), 18 deletions(-)
>
> diff --git a/cli/admin/Cargo.toml b/cli/admin/Cargo.toml
> index 0dec423..e566b39 100644
> --- a/cli/admin/Cargo.toml
> +++ b/cli/admin/Cargo.toml
> @@ -19,6 +19,9 @@ proxmox-product-config.workspace = true
>  proxmox-router = { workspace = true, features = [ "cli" ], default-features = false }
>  proxmox-schema = { workspace = true, features = [ "api-macro" ] }
>  proxmox-access-control.workspace = true
> +proxmox-rest-server.workspace = true
> +proxmox-sys.workspace = true
> +proxmox-daemon.workspace = true
>  
>  pdm-api-types.workspace = true
>  pdm-config.workspace = true
> diff --git a/cli/admin/src/main.rs b/cli/admin/src/main.rs
> index f698fa2..02148e3 100644
> --- a/cli/admin/src/main.rs
> +++ b/cli/admin/src/main.rs
> @@ -1,35 +1,33 @@
> +use anyhow::{Context, Error};
>  use serde_json::{json, Value};
>  
>  use proxmox_router::cli::{
> -    default_table_format_options, format_and_print_result_full, get_output_format, run_cli_command,
> -    CliCommand, CliCommandMap, CliEnvironment, ColumnConfig, OUTPUT_FORMAT,
> +    default_table_format_options, format_and_print_result_full, get_output_format,
> +    run_async_cli_command, CliCommand, CliCommandMap, CliEnvironment, ColumnConfig, OUTPUT_FORMAT,
>  };
>  use proxmox_router::RpcEnvironment;
> -
>  use proxmox_schema::api;
> +use proxmox_sys::fs::CreateOptions;
>  
>  mod remotes;
>  mod support_status;
>  
> -fn main() {
> -    //pbs_tools::setup_libc_malloc_opts(); // TODO: move from PBS to proxmox-sys and uncomment
> -
> -    let api_user = pdm_config::api_user().expect("cannot get api user");
> -    let priv_user = pdm_config::priv_user().expect("cannot get privileged user");
> -    proxmox_product_config::init(api_user, priv_user);
> +async fn run() -> Result<(), Error> {
> +    let api_user = pdm_config::api_user().context("could not get api user")?;
> +    let priv_user = pdm_config::priv_user().context("could not get privileged user")?;
>  
> +    proxmox_product_config::init(api_user.clone(), priv_user);
>      proxmox_access_control::init::init(
>          &pdm_api_types::AccessControlConfig,
>          pdm_buildcfg::configdir!("/access"),
>      )
> -    .expect("failed to setup access control config");
> -
> +    .context("failed to setup access control config")?;
>      proxmox_log::Logger::from_env("PDM_LOG", proxmox_log::LevelFilter::INFO)
>          .stderr()
>          .init()
> -        .expect("failed to set up logger");
> +        .context("failed to set-up logger")?;

The string here changed, the original version seems to be more correct
to me

>  
> -    server::context::init().expect("could not set up server context");
> +    server::context::init().context("could not set-up server context")?;
>  
>      let cmd_def = CliCommandMap::new()
>          .insert("remote", remotes::cli())
> @@ -40,14 +38,33 @@ fn main() {
>          .insert("support-status", support_status::cli())
>          .insert("versions", CliCommand::new(&API_METHOD_GET_VERSIONS));
>  
> +    let args: Vec<String> = std::env::args().collect();
> +    let avoid_init = args.len() >= 2 && (args[1] == "bashcomplete" || args[1] == "printdoc");

For what it's worth, this could be

    let avoid_init = matches!(
        args.get(1).map(String::as_str),
        Some("bashcomplete") | Some("printdoc")
    );

or

    let avoid_init = args
        .get(1)
        .is_some_and(|c| c == "bashcomplete" || c == "printdoc");

It's not really shorter, but I think they would be a bit more idiomatic.

The original version relies on the short-circuit behavior of the &&
operator to avoid the panic when accessing the array element via the
index operator, which is of course correct, but I think this can be
written a bit nicer.

no hard feelings, so just pick whichever version you like most.

> +
> +    if !avoid_init {
> +        let file_opts = CreateOptions::new().owner(api_user.uid).group(api_user.gid);
> +        proxmox_rest_server::init_worker_tasks(pdm_buildcfg::PDM_LOG_DIR_M!().into(), file_opts)
> +            .context("failed to initialize worker tasks")?;
> +
> +        let mut command_sock = proxmox_daemon::command_socket::CommandSocket::new(api_user.gid);
> +        proxmox_rest_server::register_task_control_commands(&mut command_sock)
> +            .context("failed to register task control commands")?;
> +        command_sock
> +            .spawn(proxmox_rest_server::last_worker_future())
> +            .context("failed to activate the socket")?;
> +    }
> +
>      let mut rpcenv = CliEnvironment::new();
>      rpcenv.set_auth_id(Some("root@pam".into()));
>  
> -    run_cli_command(
> -        cmd_def,
> -        rpcenv,
> -        Some(|future| proxmox_async::runtime::main(future)),
> -    );
> +    run_async_cli_command(cmd_def, rpcenv).await;
> +
> +    Ok(())
> +}
> +
> +fn main() -> Result<(), Error> {
> +    //pbs_tools::setup_libc_malloc_opts(); // TODO: move from PBS to proxmox-sys and uncomment
> +    proxmox_async::runtime::main(run())
>  }
>  
>  #[api(