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 E0A071FF144 for ; Tue, 24 Mar 2026 19:34:11 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 3CA041BB0E; Tue, 24 Mar 2026 19:31:47 +0100 (CET) From: Daniel Kral To: pve-devel@lists.proxmox.com Subject: [PATCH proxmox v2 08/40] resource-scheduling: factor out topsis alternative mapping Date: Tue, 24 Mar 2026 19:29:52 +0100 Message-ID: <20260324183029.1274972-9-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: 1774376988089 X-SPAM-LEVEL: Spam detection results: 0 AWL -1.445 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 URIBL_BLACK 3 Contains an URL listed in the URIBL blacklist [node.name] Message-ID-Hash: UVQ5PQWZN7P25QEJD3NCBSCNWEYFSFEY X-Message-ID-Hash: UVQ5PQWZN7P25QEJD3NCBSCNWEYFSFEY 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 same calculation will be needed for the scoring of migrations with the TOPSIS method in the following patch. Signed-off-by: Daniel Kral --- changes v1 -> v2: - new! proxmox-resource-scheduling/src/scheduler.rs | 68 ++++++++++++-------- 1 file changed, 42 insertions(+), 26 deletions(-) diff --git a/proxmox-resource-scheduling/src/scheduler.rs b/proxmox-resource-scheduling/src/scheduler.rs index 47abffb1..69dc6f4e 100644 --- a/proxmox-resource-scheduling/src/scheduler.rs +++ b/proxmox-resource-scheduling/src/scheduler.rs @@ -43,6 +43,44 @@ impl Scheduler { } } + /// Map the current node usages to a [`PveTopsisAlternative`]. + /// + /// The [`PveTopsisAlternative`] is derived by calculating a modified version of the root mean + /// square (RMS) and maximum value of each stat in the node usages. + fn topsis_alternative_with( + &self, + map_node_stats: impl Fn(&NodeUsage) -> NodeStats, + ) -> PveTopsisAlternative { + let len = self.nodes.len(); + + // Base values on percentages to allow comparing nodes with different stats. + let mut highest_cpu = 0.0; + let mut squares_cpu = 0.0; + let mut highest_mem = 0.0; + let mut squares_mem = 0.0; + + for node in self.nodes.iter() { + let new_stats = map_node_stats(node); + + let new_cpu = new_stats.cpu_load(); + highest_cpu = f64::max(highest_cpu, new_cpu); + squares_cpu += new_cpu.powi(2); + + let new_mem = new_stats.mem_load(); + highest_mem = f64::max(highest_mem, new_mem); + squares_mem += new_mem.powi(2); + } + + // Add 1.0 to avoid boosting tiny differences: e.g. 0.004 is twice as much as 0.002, but + // 1.004 is only slightly more than 1.002. + PveTopsisAlternative { + average_cpu: 1.0 + (squares_cpu / len as f64).sqrt(), + highest_cpu: 1.0 + highest_cpu, + average_memory: 1.0 + (squares_mem / len as f64).sqrt(), + highest_memory: 1.0 + highest_mem, + } + } + /// Scores nodes to start a resource with the usage statistics `resource_stats` on. /// /// The scoring is done as if the resource is already started on each node. This assumes that @@ -55,43 +93,21 @@ impl Scheduler { &self, resource_stats: T, ) -> Result, Error> { - let len = self.nodes.len(); let resource_stats = resource_stats.into(); let matrix = self .nodes .iter() .map(|node| { - // Base values on percentages to allow comparing nodes with different stats. - let mut highest_cpu = 0.0; - let mut squares_cpu = 0.0; - let mut highest_mem = 0.0; - let mut squares_mem = 0.0; - - for target_node in self.nodes.iter() { + self.topsis_alternative_with(|target_node| { let mut new_stats = target_node.stats; if node.name == target_node.name { new_stats.add_started_resource(&resource_stats) - }; + } - let new_cpu = new_stats.cpu_load(); - highest_cpu = f64::max(highest_cpu, new_cpu); - squares_cpu += new_cpu.powi(2); - - let new_mem = new_stats.mem_load(); - highest_mem = f64::max(highest_mem, new_mem); - squares_mem += new_mem.powi(2); - } - - // Add 1.0 to avoid boosting tiny differences: e.g. 0.004 is twice as much as 0.002, but - // 1.004 is only slightly more than 1.002. - PveTopsisAlternative { - average_cpu: 1.0 + (squares_cpu / len as f64).sqrt(), - highest_cpu: 1.0 + highest_cpu, - average_memory: 1.0 + (squares_mem / len as f64).sqrt(), - highest_memory: 1.0 + highest_mem, - } + new_stats + }) .into() }) .collect::>(); -- 2.47.3