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 68F421FF144 for ; Tue, 24 Mar 2026 19:31:16 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 51C2719CAF; Tue, 24 Mar 2026 19:31:10 +0100 (CET) From: Daniel Kral To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox v2 03/40] resource-scheduling: rename service to resource where appropriate Date: Tue, 24 Mar 2026 19:29:47 +0100 Message-ID: <20260324183029.1274972-4-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: 1774376987696 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.053 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. 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: ACGAU3RNULDOLRB2EXER2OCGQDTFUVVD X-Message-ID-Hash: ACGAU3RNULDOLRB2EXER2OCGQDTFUVVD 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 term `resource` is more appropriate with respect to the crate name and also the preferred name for the current main application in the HA Manager. Signed-off-by: Daniel Kral --- changes v1 -> v2: - new! proxmox-resource-scheduling/src/pve_static.rs | 2 +- proxmox-resource-scheduling/src/scheduler.rs | 14 +++++++------- 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/proxmox-resource-scheduling/src/pve_static.rs b/proxmox-resource-scheduling/src/pve_static.rs index 5df0be37..c7e1d1b1 100644 --- a/proxmox-resource-scheduling/src/pve_static.rs +++ b/proxmox-resource-scheduling/src/pve_static.rs @@ -62,5 +62,5 @@ pub fn score_nodes_to_start_service>( nodes: &[T], service: &StaticServiceUsage, ) -> Result, Error> { - scheduler::score_nodes_to_start_service(nodes, service) + scheduler::score_nodes_to_start_resource(nodes, service) } diff --git a/proxmox-resource-scheduling/src/scheduler.rs b/proxmox-resource-scheduling/src/scheduler.rs index 385015e3..39ee44ce 100644 --- a/proxmox-resource-scheduling/src/scheduler.rs +++ b/proxmox-resource-scheduling/src/scheduler.rs @@ -22,14 +22,14 @@ criteria_struct! { static PVE_HA_TOPSIS_CRITERIA; } -/// Scores candidate `nodes` to start a `service` on. Scoring is done according to the static memory -/// and CPU usages of the nodes as if the service would already be running on each. +/// Scores candidate `nodes` to start a `resource` on. Scoring is done according to the static memory +/// and CPU usages of the nodes as if the resource would already be running on each. /// /// Returns a vector of (nodename, score) pairs. Scores are between 0.0 and 1.0 and a higher score /// is better. -pub fn score_nodes_to_start_service>( +pub fn score_nodes_to_start_resource>( nodes: &[T], - service: &StaticServiceUsage, + resource: &StaticServiceUsage, ) -> Result, Error> { let len = nodes.len(); @@ -46,10 +46,10 @@ pub fn score_nodes_to_start_service>( for (index, node) in nodes.iter().enumerate() { let node = node.as_ref(); let new_cpu = if index == target_index { - if service.maxcpu == 0.0 { + if resource.maxcpu == 0.0 { node.cpu + node.maxcpu as f64 } else { - node.cpu + service.maxcpu + node.cpu + resource.maxcpu } } else { node.cpu @@ -58,7 +58,7 @@ pub fn score_nodes_to_start_service>( squares_cpu += new_cpu.powi(2); let new_mem = if index == target_index { - node.mem + service.maxmem + node.mem + resource.maxmem } else { node.mem } as f64 -- 2.47.3