[pve-devel] [PATCH ha-manager v2 12/12] config: remove duplicate config reads in get_resource_motion_info

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

read_and_compile_rules_config(...) is only used here and makes duplicate
config reads for the manager status and resource config.

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

 src/PVE/HA/Config.pm | 15 ++++++---------
 1 file changed, 6 insertions(+), 9 deletions(-)

diff --git a/src/PVE/HA/Config.pm b/src/PVE/HA/Config.pm
index 7304955a..be85b8dc 100644
--- a/src/PVE/HA/Config.pm
+++ b/src/PVE/HA/Config.pm
@@ -242,17 +242,11 @@ sub read_and_check_rules_config {
     return $rules;
 }
 
-sub read_and_compile_rules_config {
+my sub compile_rules_config {
+    my ($rules, $groups, $resources, $manager_status) = @_;
 
-    my $rules = read_and_check_rules_config();
-
-    my $manager_status = read_manager_status();
     my $nodes = [keys $manager_status->{node_status}->%*];
 
-    # TODO PVE 10: Remove group migration when HA groups have been fully migrated to location rules
-    my $groups = read_group_config();
-    my $resources = read_and_check_resources_config();
-
     PVE::HA::Groups::migrate_groups_to_rules($rules, $groups, $resources);
 
     PVE::HA::Rules->transform($rules, $nodes);
@@ -413,7 +407,10 @@ sub get_resource_motion_info {
         # get_resource_motion_info expects a resource config with defaults set
         my $resources = checked_resources_config($cfg);
 
-        my $compiled_rules = read_and_compile_rules_config();
+        my $rules = read_and_check_rules_config();
+        # TODO PVE 10: Remove group migration when HA groups have been fully migrated to rules
+        my $groups = read_group_config();
+        my $compiled_rules = compile_rules_config($rules, $groups, $resources, $manager_status);
 
         my $cd = $resources->{$sid} // {};
         ($dependent_resources, $blocking_resources_by_node) =
-- 
2.47.3



_______________________________________________
pve-devel mailing list
pve-devel@lists.proxmox.com
https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel