From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 12D7B1FF144 for ; Tue, 24 Mar 2026 19:30:40 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 05BFB19645; Tue, 24 Mar 2026 19:30:42 +0100 (CET) From: Daniel Kral To: pve-devel@lists.proxmox.com Subject: [PATCH perl-rs v2 10/40] pve-rs: resource-scheduling: remove pedantic error handling from remove_node Date: Tue, 24 Mar 2026 19:29:54 +0100 Message-ID: <20260324183029.1274972-11-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260324183029.1274972-1-d.kral@proxmox.com> References: <20260324183029.1274972-1-d.kral@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1774376988208 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.054 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: O5G74J2GKPK7KHN2ZG5VVI67YP4J4MZ4 X-Message-ID-Hash: O5G74J2GKPK7KHN2ZG5VVI67YP4J4MZ4 X-MailFrom: d.kral@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 VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The error can only happen due to an error in add_service_usage_to_node(...), but prevents all the following service_nodes entries from being cleaned up correctly. While technically a API break, removing the error does not change any callers, which do not handle the error anyway. Additionally, remove_node(...) is only used in testing code in this package and pve-ha-manager, but is currently unused for production code. This change makes the implementation more consistent with the new proxmox_resource_scheduling::usage::Usage, which will replace this in a following patch. Signed-off-by: Daniel Kral --- changes v1 -> v2: - new! pve-rs/src/bindings/resource_scheduling_static.rs | 15 +++------------ 1 file changed, 3 insertions(+), 12 deletions(-) diff --git a/pve-rs/src/bindings/resource_scheduling_static.rs b/pve-rs/src/bindings/resource_scheduling_static.rs index 5b91d36..6e57b9d 100644 --- a/pve-rs/src/bindings/resource_scheduling_static.rs +++ b/pve-rs/src/bindings/resource_scheduling_static.rs @@ -75,25 +75,16 @@ pub mod pve_rs_resource_scheduling_static { /// Method: Remove a node from the scheduler. #[export] - pub fn remove_node(#[try_from_ref] this: &Scheduler, nodename: &str) -> Result<(), Error> { + pub fn remove_node(#[try_from_ref] this: &Scheduler, nodename: &str) { let mut usage = this.inner.lock().unwrap(); if let Some(node) = usage.nodes.remove(nodename) { for (sid, _) in node.services.iter() { - match usage.service_nodes.get_mut(sid) { - Some(service_nodes) => { - service_nodes.remove(nodename); - } - None => bail!( - "service '{}' not present in service_nodes hashmap while removing node '{}'", - sid, - nodename - ), + if let Some(service_nodes) = usage.service_nodes.get_mut(sid) { + service_nodes.remove(nodename); } } } - - Ok(()) } /// Method: Get a list of all the nodes in the scheduler. -- 2.47.3