all lists on lists.proxmox.com
 help / color / mirror / Atom feed
From: Daniel Kral <d.kral@proxmox.com>
To: pve-devel@lists.proxmox.com
Subject: [PATCH ha-manager v3 14/17] config: remove duplicate config reads in get_resource_motion_info
Date: Mon, 11 May 2026 11:46:35 +0200	[thread overview]
Message-ID: <20260511094707.142930-15-d.kral@proxmox.com> (raw)
In-Reply-To: <20260511094707.142930-1-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 v2 -> v3:
- none

 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 e9551dfb..eb1f9b7a 100644
--- a/src/PVE/HA/Config.pm
+++ b/src/PVE/HA/Config.pm
@@ -236,17 +236,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);
@@ -412,7 +406,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





  parent reply	other threads:[~2026-05-11  9:49 UTC|newest]

Thread overview: 20+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2026-05-11  9:46 [PATCH-SERIES container/ha-manager/manager/qemu-server v3 00/17] HA node affinity blockers (#1497) Daniel Kral
2026-05-11  9:46 ` [PATCH ha-manager v3 01/17] ha: put source files on individual new lines Daniel Kral
2026-05-11  9:46 ` [PATCH ha-manager v3 02/17] d/pve-ha-manager.install: remove duplicate Config.pm Daniel Kral
2026-05-11  9:46 ` [PATCH ha-manager v3 03/17] config: group and sort use statements Daniel Kral
2026-05-11  9:46 ` [PATCH ha-manager v3 04/17] manager: " Daniel Kral
2026-05-11  9:46 ` [PATCH ha-manager v3 05/17] manager: report all reasons when resources are blocked from migration Daniel Kral
2026-05-11  9:46 ` [PATCH ha-manager v3 06/17] config, manager: factor out resource motion info logic Daniel Kral
2026-05-11  9:46 ` [PATCH ha-manager v3 07/17] tests: add test cases for migrating resources with node affinity rules Daniel Kral
2026-05-11  9:46 ` [PATCH ha-manager v3 08/17] fix #1497: handle strict node affinity rules in manual migrations Daniel Kral
2026-05-11  9:46 ` [PATCH ha-manager v3 09/17] config: improve variable names in read_and_check_resources_config Daniel Kral
2026-05-11  9:46 ` [PATCH ha-manager v3 10/17] config: factor out checked_resources_config helper Daniel Kral
2026-05-11  9:46 ` [PATCH ha-manager v3 11/17] manager: store global reference to service config hash Daniel Kral
2026-05-11  9:46 ` [PATCH ha-manager v3 12/17] manager: remove duplicate service config read in update_crm_commands Daniel Kral
2026-05-11  9:46 ` [PATCH ha-manager v3 13/17] fix #1497: handle node affinity rules with failback in manual migrations Daniel Kral
2026-05-11  9:46 ` Daniel Kral [this message]
2026-05-11  9:46 ` [PATCH qemu-server v3 15/17] api: migration preconditions: add node affinity as blocking cause Daniel Kral
2026-05-11  9:46 ` [PATCH container v3 16/17] " Daniel Kral
2026-05-11  9:46 ` [PATCH manager v3 17/17] ui: migrate: display precondition messages for ha node affinity Daniel Kral
2026-05-15  4:51 ` applied: [PATCH-SERIES container/ha-manager/manager/qemu-server v3 00/17] HA node affinity blockers (#1497) Thomas Lamprecht
2026-05-15  5:04 ` Thomas Lamprecht

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20260511094707.142930-15-d.kral@proxmox.com \
    --to=d.kral@proxmox.com \
    --cc=pve-devel@lists.proxmox.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.
Service provided by Proxmox Server Solutions GmbH | Privacy | Legal