[PATCH ha-manager v3 11/17] manager: store global reference to service config hash

[Daniel Kral <d.kral@proxmox.com>]

This is in preparation for an upcoming patch, which makes
get_resource_motion_info() aware of the HA resources' failback flag in
conjunction with node affinity rules.

This change is chosen in favor of passing down the $sc variable through
several method calls that otherwise wouldn't need a reference to the
service config hash in the upcoming patch.

Signed-off-by: Daniel Kral <d.kral@proxmox.com>
---
changes v2 -> v3:
- new

 src/PVE/HA/Manager.pm | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm
index 2d1c6d5d..c4088dac 100644
--- a/src/PVE/HA/Manager.pm
+++ b/src/PVE/HA/Manager.pm
@@ -82,6 +82,7 @@ sub new {
     $self->{ns} = PVE::HA::NodeStatus->new($haenv, $old_ms->{node_status} || {});
 
     # fixme: use separate class  PVE::HA::ServiceStatus
+    $self->{sc} = {};
     $self->{ss} = $old_ms->{service_status} || {};
 
     $self->{ms} = { master_node => $haenv->nodename() };
@@ -1002,7 +1003,7 @@ sub manage {
 
     $self->try_persistent_group_migration();
 
-    my ($sc, $services_digest) = $haenv->read_service_config();
+    ($self->{sc}, my $services_digest) = $haenv->read_service_config();
 
     $self->{groups} = $haenv->read_group_config(); # update
 
@@ -1011,9 +1012,9 @@ sub manage {
     # skip service add/remove when disarmed - handle_disarm manages service status
     if (!$ms->{disarm}) {
         # add new service
-        foreach my $sid (sort keys %$sc) {
+        foreach my $sid (sort keys $self->{sc}->%*) {
             next if $ss->{$sid}; # already there
-            my $cd = $sc->{$sid};
+            my $cd = $self->{sc}->{$sid};
             next if $cd->{state} eq 'ignored';
 
             $haenv->log('info', "adding new service '$sid' on node '$cd->{node}'");
@@ -1028,9 +1029,10 @@ sub manage {
 
         # remove stale or ignored services from manager state
         foreach my $sid (keys %$ss) {
-            next if $sc->{$sid} && $sc->{$sid}->{state} ne 'ignored';
+            my $cd = $self->{sc}->{$sid};
+            next if $cd && $cd->{state} ne 'ignored';
 
-            my $reason = defined($sc->{$sid}) ? 'ignored state requested' : 'no config';
+            my $reason = defined($cd) ? 'ignored state requested' : 'no config';
             $haenv->log('info', "removing stale service '$sid' ($reason)");
 
             # remove all service related state information
@@ -1043,7 +1045,7 @@ sub manage {
     my $new_rules = $haenv->read_rules_config();
 
     # TODO PVE 10: Remove group migration when HA groups have been fully migrated to rules
-    PVE::HA::Groups::migrate_groups_to_resources($self->{groups}, $sc);
+    PVE::HA::Groups::migrate_groups_to_resources($self->{groups}, $self->{sc});
 
     if (
         !$self->{compiled_rules}
@@ -1052,7 +1054,7 @@ sub manage {
         || $self->{groups}->{digest} ne $self->{last_groups_digest}
         || $services_digest && $services_digest ne $self->{last_services_digest}
     ) {
-        PVE::HA::Groups::migrate_groups_to_rules($new_rules, $self->{groups}, $sc);
+        PVE::HA::Groups::migrate_groups_to_rules($new_rules, $self->{groups}, $self->{sc});
 
         my $nodes = $self->{ns}->list_nodes();
         my $messages = PVE::HA::Rules->transform($new_rules, $nodes);
@@ -1088,7 +1090,7 @@ sub manage {
         foreach my $sid (sort keys %$ss) {
             next if $deferred_sids && !$deferred_sids->{$sid};
             my $sd = $ss->{$sid};
-            my $cd = $sc->{$sid} || { state => 'disabled' };
+            my $cd = $self->{sc}->{$sid} || { state => 'disabled' };
 
             my $lrm_res = $sd->{uid} ? $lrm_results->{ $sd->{uid} } : undef;
 
-- 
2.47.3