From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [IPv6:2a01:7e0:0:424::9]) by lore.proxmox.com (Postfix) with ESMTPS id A95491FF146 for ; Tue, 20 Jan 2026 16:29:08 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AF6E113355; Tue, 20 Jan 2026 16:29:03 +0100 (CET) From: Daniel Kral To: pve-devel@lists.proxmox.com Date: Tue, 20 Jan 2026 16:27:44 +0100 Message-ID: <20260120152755.499037-13-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260120152755.499037-1-d.kral@proxmox.com> References: <20260120152755.499037-1-d.kral@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1768922825133 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.016 Adjusted score from AWL reputation of From: address BAYES_00 -1.9 Bayes spam probability is 0 to 1% DMARC_MISSING 0.1 Missing DMARC policy KAM_DMARC_STATUS 0.01 Test Rule for DKIM or SPF Failure with Strict Alignment SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: [pve-devel] [PATCH ha-manager v2 12/12] config: remove duplicate config reads in get_resource_motion_info X-BeenThere: pve-devel@lists.proxmox.com X-Mailman-Version: 2.1.29 Precedence: list List-Id: Proxmox VE development discussion List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Reply-To: Proxmox VE development discussion Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: pve-devel-bounces@lists.proxmox.com Sender: "pve-devel" 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 --- 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