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 D18EF1FF137 for ; Tue, 03 Feb 2026 18:44:12 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6D519177A; Tue, 3 Feb 2026 18:44:41 +0100 (CET) From: Shan Shaji To: pdm-devel@lists.proxmox.com Subject: [PATCH datacenter-manager 1/4] cli: admin: make cli handling async Date: Tue, 3 Feb 2026 18:44:17 +0100 Message-ID: <20260203174420.453118-2-s.shaji@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260203174420.453118-1-s.shaji@proxmox.com> References: <20260203174420.453118-1-s.shaji@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1770140599833 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.109 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 Message-ID-Hash: OA6MW5II6DXH5P5ILHLSX2SJAEPLODXS X-Message-ID-Hash: OA6MW5II6DXH5P5ILHLSX2SJAEPLODXS X-MailFrom: s.shaji@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox Datacenter Manager development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: 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 --- 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")?; - 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 = std::env::args().collect(); + let avoid_init = args.len() >= 2 && (args[1] == "bashcomplete" || args[1] == "printdoc"); + + 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( -- 2.47.3