fix relocate/restart trial count leak on service deletion

If a service gets remove from HA remove also its relocate and
restart trial count from LRM status and manager_status, else it
never gets deleted (leak).

Signed-off-by: Thomas Lamprecht <t.lamprecht@proxmox.com>

diff --git a/src/PVE/HA/LRM.pm b/src/PVE/HA/LRM.pm
index fcbc33f853c918439d54a5d0f040609b6480b151..d49873fbb5b68cc0ca49028ea4f3066cf2bdb87d 100644 (file)
--- a/src/PVE/HA/LRM.pm
+++ b/src/PVE/HA/LRM.pm
@@ -438,6 +438,10 @@ sub manage_resources {
 
     my $ss = $self->{service_status};
 
+    foreach my $sid (keys %{$self->{restart_tries}}) {
+       delete $self->{restart_tries}->{$sid} if !$ss->{$sid};
+    }
+
     foreach my $sid (keys %$ss) {
        my $sd = $ss->{$sid};
        next if !$sd->{node};

diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm
index 627036bdc56424d27b65e8bcf501a5e06f9ca562..9b299010f80e015504d7be87bda53ca2aa245624 100644 (file)
--- a/src/PVE/HA/Manager.pm
+++ b/src/PVE/HA/Manager.pm
@@ -341,7 +341,12 @@ sub manage {
        $haenv->log('info', "removing stale service '$sid' (no config)");
        delete $ss->{$sid};
     }
-    
+
+    # remove stale relocation try entries
+    foreach my $sid (keys %{$ms->{relocate_trial}}) {
+       delete $ms->{relocate_trial}->{$sid} if !$ss->{$sid};
+    }
+
     $self->update_crm_commands();
 
     for (;;) {