[pbs-devel] [PATCH proxmox-backup] fix: proxmox-backup-manager network reload wait on worker

[Gabriel Goller <g.goller@proxmox.com>]

Make the `network reload` command in proxmox-backup-manager wait on the
api handler's workertask. Otherwise the task would be killed when the
client exits.

Signed-off-by: Gabriel Goller <g.goller@proxmox.com>
---
 src/bin/proxmox_backup_manager/network.rs | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/src/bin/proxmox_backup_manager/network.rs b/src/bin/proxmox_backup_manager/network.rs
index deac5b1b2960..0f0a50a8932a 100644
--- a/src/bin/proxmox_backup_manager/network.rs
+++ b/src/bin/proxmox_backup_manager/network.rs
@@ -129,6 +129,24 @@ fn pending_network_changes(
     Ok(Value::Null)
 }
 
+#[api()]
+/// Reload network changes
+async fn reload_network_changes(
+    mut param: Value,
+    rpcenv: &mut dyn RpcEnvironment,
+) -> Result<Value, Error> {
+    param["node"] = "localhost".into();
+
+    let info = &api2::node::network::API_METHOD_RELOAD_NETWORK_CONFIG;
+    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(Value::Null)
+}
+
 pub fn network_commands() -> CommandLineInterface {
     let cmd_def = CliCommandMap::new()
         .insert("list", CliCommand::new(&API_METHOD_LIST_NETWORK_DEVICES))
@@ -168,8 +186,7 @@ pub fn network_commands() -> CommandLineInterface {
         )
         .insert(
             "reload",
-            CliCommand::new(&api2::node::network::API_METHOD_RELOAD_NETWORK_CONFIG)
-                .fixed_param("node", String::from("localhost")),
+            CliCommand::new(&API_METHOD_RELOAD_NETWORK_CHANGES),
         );
 
     cmd_def.into()
-- 
2.39.2



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