[PATCH proxmox-perl-rs 06/15] fix #7993: pve-rs: resource-scheduling: add weights to pve bindings

[Dominik Rusovac <d.rusovac@proxmox.com>]

Add weights for weighted load balancing.

Adjust existing resource scheduling test to explicitly use same weights
as before.

Signed-off-by: Dominik Rusovac <d.rusovac@proxmox.com>
---
 .../resource_scheduling/pve_dynamic.rs        | 27 +++++++++++++++----
 .../resource_scheduling/pve_static.rs         | 25 +++++++++++++----
 pve-rs/test/resource_scheduling.pl            |  3 ++-
 3 files changed, 44 insertions(+), 11 deletions(-)

diff --git a/pve-rs/src/bindings/resource_scheduling/pve_dynamic.rs b/pve-rs/src/bindings/resource_scheduling/pve_dynamic.rs
index 8e066e0..d6b6f9b 100644
--- a/pve-rs/src/bindings/resource_scheduling/pve_dynamic.rs
+++ b/pve-rs/src/bindings/resource_scheduling/pve_dynamic.rs
@@ -166,10 +166,16 @@ pub mod pve_rs_resource_scheduling_dynamic {
     ///
     /// See [`proxmox_resource_scheduling::scheduler::Scheduler::node_imbalance`].
     #[export]
-    pub fn calculate_node_imbalance(#[try_from_ref] this: &Scheduler) -> f64 {
+    pub fn calculate_node_imbalance(
+        #[try_from_ref] this: &Scheduler,
+        cpu_weight: usize,
+        mem_weight: usize,
+    ) -> f64 {
         let usage = this.inner.lock().unwrap();
 
-        usage.to_scheduler::<IdentityAggregator>().node_imbalance()
+        usage
+            .to_scheduler::<IdentityAggregator>()
+            .node_imbalance(cpu_weight as f64, mem_weight as f64)
     }
 
     /// Method: Scores the given migration `candidates` by the best node imbalance improvement with
@@ -181,6 +187,8 @@ pub mod pve_rs_resource_scheduling_dynamic {
         #[try_from_ref] this: &Scheduler,
         candidates: Vec<CompactMigrationCandidate>,
         limit: usize,
+        cpu_weight: usize,
+        mem_weight: usize,
     ) -> Result<Vec<ScoredMigration>, Error> {
         let usage = this.inner.lock().unwrap();
 
@@ -188,7 +196,7 @@ pub mod pve_rs_resource_scheduling_dynamic {
 
         Ok(usage
             .to_scheduler::<IdentityAggregator>()
-            .score_best_balancing_migration_candidates(candidates, limit))
+            .score_best_balancing_migration_candidates(candidates, limit, cpu_weight, mem_weight))
     }
 
     /// Method: Scores the given migration `candidates` by the best node imbalance improvement with
@@ -200,6 +208,8 @@ pub mod pve_rs_resource_scheduling_dynamic {
         #[try_from_ref] this: &Scheduler,
         candidates: Vec<CompactMigrationCandidate>,
         limit: usize,
+        cpu_weight: usize,
+        mem_weight: usize,
     ) -> Result<Vec<ScoredMigration>, Error> {
         let usage = this.inner.lock().unwrap();
 
@@ -207,7 +217,12 @@ pub mod pve_rs_resource_scheduling_dynamic {
 
         usage
             .to_scheduler::<IdentityAggregator>()
-            .score_best_balancing_migration_candidates_topsis(&candidates, limit)
+            .score_best_balancing_migration_candidates_topsis(
+                &candidates,
+                limit,
+                cpu_weight,
+                mem_weight,
+            )
     }
 
     /// Method: Scores nodes to start a resource with the usage statistics `resource_stats` on.
@@ -217,11 +232,13 @@ pub mod pve_rs_resource_scheduling_dynamic {
     pub fn score_nodes_to_start_resource(
         #[try_from_ref] this: &Scheduler,
         resource_stats: DynamicResourceStats,
+        cpu_weight: usize,
+        mem_weight: usize,
     ) -> Result<Vec<(String, f64)>, Error> {
         let usage = this.inner.lock().unwrap();
 
         usage
             .to_scheduler::<StartingAsStartedResourceAggregator>()
-            .score_nodes_to_start_resource(resource_stats)
+            .score_nodes_to_start_resource(resource_stats, cpu_weight, mem_weight)
     }
 }
diff --git a/pve-rs/src/bindings/resource_scheduling/pve_static.rs b/pve-rs/src/bindings/resource_scheduling/pve_static.rs
index d83aa38..2fa8d8c 100644
--- a/pve-rs/src/bindings/resource_scheduling/pve_static.rs
+++ b/pve-rs/src/bindings/resource_scheduling/pve_static.rs
@@ -162,12 +162,16 @@ pub mod pve_rs_resource_scheduling_static {
     ///
     /// See [`proxmox_resource_scheduling::scheduler::Scheduler::node_imbalance`].
     #[export]
-    pub fn calculate_node_imbalance(#[try_from_ref] this: &Scheduler) -> f64 {
+    pub fn calculate_node_imbalance(
+        #[try_from_ref] this: &Scheduler,
+        cpu_weight: usize,
+        mem_weight: usize,
+    ) -> f64 {
         let usage = this.inner.lock().unwrap();
 
         usage
             .to_scheduler::<StartedResourceAggregator>()
-            .node_imbalance()
+            .node_imbalance(cpu_weight as f64, mem_weight as f64)
     }
 
     /// Method: Scores the given migration `candidates` by the best node imbalance improvement with
@@ -179,6 +183,8 @@ pub mod pve_rs_resource_scheduling_static {
         #[try_from_ref] this: &Scheduler,
         candidates: Vec<CompactMigrationCandidate>,
         limit: usize,
+        cpu_weight: usize,
+        mem_weight: usize,
     ) -> Result<Vec<ScoredMigration>, Error> {
         let usage = this.inner.lock().unwrap();
 
@@ -186,7 +192,7 @@ pub mod pve_rs_resource_scheduling_static {
 
         Ok(usage
             .to_scheduler::<StartedResourceAggregator>()
-            .score_best_balancing_migration_candidates(candidates, limit))
+            .score_best_balancing_migration_candidates(candidates, limit, cpu_weight, mem_weight))
     }
 
     /// Method: Scores the given migration `candidates` by the best node imbalance improvement with
@@ -198,6 +204,8 @@ pub mod pve_rs_resource_scheduling_static {
         #[try_from_ref] this: &Scheduler,
         candidates: Vec<CompactMigrationCandidate>,
         limit: usize,
+        cpu_weight: usize,
+        mem_weight: usize,
     ) -> Result<Vec<ScoredMigration>, Error> {
         let usage = this.inner.lock().unwrap();
 
@@ -205,7 +213,12 @@ pub mod pve_rs_resource_scheduling_static {
 
         usage
             .to_scheduler::<StartedResourceAggregator>()
-            .score_best_balancing_migration_candidates_topsis(&candidates, limit)
+            .score_best_balancing_migration_candidates_topsis(
+                &candidates,
+                limit,
+                cpu_weight,
+                mem_weight,
+            )
     }
 
     /// Method: Scores nodes to start a service with the usage statistics `service_stats` on.
@@ -215,11 +228,13 @@ pub mod pve_rs_resource_scheduling_static {
     pub fn score_nodes_to_start_service(
         #[try_from_ref] this: &Scheduler,
         service_stats: StaticResourceStats,
+        cpu_weight: usize,
+        mem_weight: usize,
     ) -> Result<Vec<(String, f64)>, Error> {
         let usage = this.inner.lock().unwrap();
 
         usage
             .to_scheduler::<StartedResourceAggregator>()
-            .score_nodes_to_start_resource(service_stats)
+            .score_nodes_to_start_resource(service_stats, cpu_weight, mem_weight)
     }
 }
diff --git a/pve-rs/test/resource_scheduling.pl b/pve-rs/test/resource_scheduling.pl
index 3775242..31f2622 100755
--- a/pve-rs/test/resource_scheduling.pl
+++ b/pve-rs/test/resource_scheduling.pl
@@ -11,7 +11,8 @@ use PVE::RS::ResourceScheduling::Dynamic;
 my sub score_nodes {
     my ($static, $service) = @_;
 
-    my $score_list = $static->score_nodes_to_start_service($service);
+    # uses original empirically determined weights
+    my $score_list = $static->score_nodes_to_start_service($service, 1.0, 5.0);
 
     # imitate HA manager
     my $scores = { map { $_->[0] => -$_->[1] } $score_list->@* };
-- 
2.47.3