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 9D0531FF15C for ; Wed, 21 Aug 2024 12:22:50 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3181017328; Wed, 21 Aug 2024 12:23:11 +0200 (CEST) From: Gabriel Goller To: pbs-devel@lists.proxmox.com Date: Wed, 21 Aug 2024 12:22:36 +0200 Message-Id: <20240821102236.220755-1-g.goller@proxmox.com> X-Mailer: git-send-email 2.39.2 MIME-Version: 1.0 X-SPAM-LEVEL: Spam detection results: 0 AWL -0.042 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 T_SCC_BODY_TEXT_LINE -0.01 - Subject: [pbs-devel] [PATCH proxmox-backup] fix: proxmox-backup-manager network reload wait on worker 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" 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 --- 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 { + 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