From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: Received: from firstgate.proxmox.com (firstgate.proxmox.com [212.224.123.68]) by lore.proxmox.com (Postfix) with ESMTPS id 4B5611FF143 for ; Mon, 19 Jan 2026 16:41:58 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id B6C0822B4D; Mon, 19 Jan 2026 16:42:05 +0100 (CET) Mime-Version: 1.0 Date: Mon, 19 Jan 2026 16:41:32 +0100 Message-Id: From: "Daniel Kral" To: "Proxmox VE development discussion" X-Mailer: aerc 0.21.0-38-g7088c3642f2c-dirty References: <20251215155334.476984-1-d.kral@proxmox.com> <20251215155334.476984-10-d.kral@proxmox.com> <1ebb86bc-360c-4ce1-8bea-4e6e3658e85b@proxmox.com> In-Reply-To: <1ebb86bc-360c-4ce1-8bea-4e6e3658e85b@proxmox.com> X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1768837238607 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 RCVD_IN_VALIDITY_CERTIFIED_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_RPBL_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. RCVD_IN_VALIDITY_SAFE_BLOCKED 0.001 ADMINISTRATOR NOTICE: The query to Validity was blocked. See https://knowledge.validity.com/hc/en-us/articles/20961730681243 for more information. SPF_HELO_NONE 0.001 SPF: HELO does not publish an SPF Record SPF_PASS -0.001 SPF: sender matches SPF record Subject: Re: [pve-devel] [PATCH ha-manager 9/9] handle node affinity rules with failback in manual migrations 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" On Mon Jan 19, 2026 at 4:00 PM CET, Fiona Ebner wrote: > Am 15.12.25 um 4:55 PM schrieb Daniel Kral: >> diff --git a/src/PVE/HA/Config.pm b/src/PVE/HA/Config.pm >> index f8c5965e..fa14816c 100644 >> --- a/src/PVE/HA/Config.pm >> +++ b/src/PVE/HA/Config.pm >> @@ -382,22 +382,27 @@ sub service_is_configured { >> sub get_resource_motion_info { >> my ($sid) = @_; >> >> - my $resources = read_resources_config(); >> + my $conf = read_resources_config(); > > Nit: maybe it's slightly nicer to use read_and_compile_rules_config() > already here and avoid a second read call below? I guess you meant read_and_check_resources_config() here ;) The service_check_ha_state(...) helper below assumes a parsed section config (and is used in a bunch of places), while read_and_check_resources_config() will return a modified version of the resource config (defaults set, etc.). What isn't nice at all here is that read_and_compile_rules_config() reads the manager status and resource config a second and third time and since it's only used here at the moment I'll make it a private helper instead of reading on its own. For read_and_check_resources_config() I'd move out the inner logic into a separate private helper, so that all of get_resource_motion_info(...) does work with the same single read from the resource config. > >> >> my $dependent_resources = []; >> my $blocking_resources_by_node = {}; >> >> - if (&$service_check_ha_state($resources, $sid)) { >> + if (&$service_check_ha_state($conf, $sid)) { >> my $manager_status = read_manager_status(); >> my $ss = $manager_status->{service_status}; >> my $ns = $manager_status->{node_status}; >> # get_resource_motion_info expects a hashset of all nodes with status 'online' >> my $online_nodes = { map { $ns->{$_} eq 'online' ? ($_ => 1) : () } keys %$ns }; >> + # get_resource_motion_info expects a resource config with defaults set >> + my $resources = read_and_check_resources_config(); >> >> my $compiled_rules = read_and_compile_rules_config(); >> >> + my $cd = $resources->{$sid} // {}; >> ($dependent_resources, $blocking_resources_by_node) = >> - PVE::HA::Helpers::get_resource_motion_info($ss, $sid, $online_nodes, $compiled_rules); >> + PVE::HA::Helpers::get_resource_motion_info( >> + $ss, $sid, $cd, $online_nodes, $compiled_rules, >> + ); >> } >> >> return ($dependent_resources, $blocking_resources_by_node); _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel