[pve-devel] [PATCH ha-manager 7/9] usage: allow granular changes to Usage implementations

[Daniel Kral]

This makes use of the new signature for add_service_usage_to_node(...)
from the Proxmox::RS::ResourceScheduling::Static package, which allows
tracking of which HA resources have been assigned to which nodes.

Signed-off-by: Daniel Kral <d.kral at proxmox.com>
---
 src/PVE/HA/Usage.pm        |  6 ++++++
 src/PVE/HA/Usage/Basic.pm  | 14 +++++++++++---
 src/PVE/HA/Usage/Static.pm | 26 ++++++++++++++++++++------
 3 files changed, 37 insertions(+), 9 deletions(-)

diff --git a/src/PVE/HA/Usage.pm b/src/PVE/HA/Usage.pm
index 66d9572e..f19fae76 100644
--- a/src/PVE/HA/Usage.pm
+++ b/src/PVE/HA/Usage.pm
@@ -40,6 +40,12 @@ sub add_service_usage_to_node {
     die "implement in subclass";
 }
 
+sub remove_service_usage {
+    my ($self, $sid) = @_;
+
+    die "implement in subclass";
+}
+
 # Returns a hash with $nodename => $score pairs. A lower $score is better.
 sub score_nodes_to_start_service {
     my ($self, $sid, $service_node) = @_;
diff --git a/src/PVE/HA/Usage/Basic.pm b/src/PVE/HA/Usage/Basic.pm
index ead08c54..9b80661a 100644
--- a/src/PVE/HA/Usage/Basic.pm
+++ b/src/PVE/HA/Usage/Basic.pm
@@ -17,7 +17,7 @@ sub new {
 sub add_node {
     my ($self, $nodename) = @_;
 
-    $self->{nodes}->{$nodename} = 0;
+    $self->{nodes}->{$nodename} = {};
 }
 
 sub remove_node {
@@ -42,7 +42,7 @@ sub add_service_usage_to_node {
     my ($self, $nodename, $sid, $service_node, $migration_target) = @_;
 
     if ($self->contains_node($nodename)) {
-        $self->{nodes}->{$nodename}++;
+        $self->{nodes}->{$nodename}->{$sid} = 1;
     } else {
         $self->{haenv}->log(
             'warning',
@@ -51,10 +51,18 @@ sub add_service_usage_to_node {
     }
 }
 
+sub remove_service_usage {
+    my ($self, $sid) = @_;
+
+    for my $node ($self->list_nodes()) {
+        delete $self->{nodes}->{$node}->{$sid};
+    }
+}
+
 sub score_nodes_to_start_service {
     my ($self, $sid, $service_node) = @_;
 
-    return $self->{nodes};
+    return { map { $_ => scalar keys $self->{nodes}->{$_}->%* } keys $self->{nodes}->%* };
 }
 
 1;
diff --git a/src/PVE/HA/Usage/Static.pm b/src/PVE/HA/Usage/Static.pm
index 061e74a2..2867d4ff 100644
--- a/src/PVE/HA/Usage/Static.pm
+++ b/src/PVE/HA/Usage/Static.pm
@@ -22,14 +22,14 @@ sub new {
         'service-stats' => {},
         haenv => $haenv,
         scheduler => $scheduler,
-        'service-counts' => {}, # Service count on each node. Fallback if scoring calculation fails.
+        'node-services' => {}, # Services on each node. Fallback if scoring calculation fails.
     }, $class;
 }
 
 sub add_node {
     my ($self, $nodename) = @_;
 
-    $self->{'service-counts'}->{$nodename} = 0;
+    $self->{'node-services'}->{$nodename} = {};
 
     my $stats = $self->{'node-stats'}->{$nodename}
         or die "did not get static node usage information for '$nodename'\n";
@@ -43,7 +43,7 @@ sub add_node {
 sub remove_node {
     my ($self, $nodename) = @_;
 
-    delete $self->{'service-counts'}->{$nodename};
+    delete $self->{'node-services'}->{$nodename};
 
     $self->{scheduler}->remove_node($nodename);
 }
@@ -89,16 +89,27 @@ my sub get_service_usage {
 sub add_service_usage_to_node {
     my ($self, $nodename, $sid, $service_node, $migration_target) = @_;
 
-    $self->{'service-counts'}->{$nodename}++;
+    $self->{'node-services'}->{$nodename}->{$sid} = 1;
 
     eval {
         my $service_usage = get_service_usage($self, $sid, $service_node, $migration_target);
-        $self->{scheduler}->add_service_usage_to_node($nodename, $service_usage);
+        $self->{scheduler}->add_service_usage_to_node($nodename, $sid, $service_usage);
     };
     $self->{haenv}->log('warning', "unable to add service '$sid' usage to node '$nodename' - $@")
         if $@;
 }
 
+sub remove_service_usage {
+    my ($self, $sid) = @_;
+
+    delete $self->{'node-services'}->{$_}->{$sid} for $self->list_nodes();
+
+    eval { $self->{scheduler}->remove_service_usage($sid) };
+    $self->{haenv}->log('warning', "unable to remove service '$sid' usage - $@") if $@;
+
+    delete $self->{'service-stats'}->{$sid}; # Invalidate old service stats
+}
+
 sub score_nodes_to_start_service {
     my ($self, $sid, $service_node) = @_;
 
@@ -111,7 +122,10 @@ sub score_nodes_to_start_service {
             'err',
             "unable to score nodes according to static usage for service '$sid' - $err",
         );
-        return $self->{'service-counts'};
+        return {
+            map { $_ => scalar keys $self->{'node-services'}->{$_}->%* }
+                keys $self->{'node-services'}->%*
+        };
     }
 
     # Take minus the value, so that a lower score is better, which our caller(s) expect(s).
-- 
2.47.3