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 36B181FF187 for ; Mon, 3 Nov 2025 11:21:26 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 2F6C717967; Mon, 3 Nov 2025 11:21:32 +0100 (CET) From: Daniel Kral To: pve-devel@lists.proxmox.com Date: Mon, 3 Nov 2025 11:19:53 +0100 Message-ID: <20251103102118.153666-10-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251103102118.153666-1-d.kral@proxmox.com> References: <20251103102118.153666-1-d.kral@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1762165266629 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.015 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 v3 09/21] rules: node affinity: decouple get_node_affinity helper from Usage class 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" This is done in preparation of the next patch, which moves some of the logic of get_node_affinity(...) in the HA rule translaton stage. Signed-off-by: Daniel Kral --- changes since v2: - minor change due to rebase on accounting series where the $online_nodes in select_service_node(...) is now shared by both affinity rule helpers - change the get_node_affinity(...) POD signature too src/PVE/HA/Manager.pm | 4 ++-- src/PVE/HA/Rules/NodeAffinity.pm | 12 ++++++------ 2 files changed, 8 insertions(+), 8 deletions(-) diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm index f42373dd..a26bde76 100644 --- a/src/PVE/HA/Manager.pm +++ b/src/PVE/HA/Manager.pm @@ -157,11 +157,11 @@ sub select_service_node { my ($current_node, $tried_nodes, $maintenance_fallback) = $sd->@{qw(node failed_nodes maintenance_node)}; - my ($allowed_nodes, $pri_nodes) = get_node_affinity($rules, $sid, $online_node_usage); + my $online_nodes = { map { $_ => 1 } $online_node_usage->list_nodes() }; + my ($allowed_nodes, $pri_nodes) = get_node_affinity($rules, $sid, $online_nodes); return undef if !%$pri_nodes; - my $online_nodes = { map { $_ => 1 } $online_node_usage->list_nodes() }; my ($together, $separate) = get_resource_affinity($rules, $sid, $ss, $online_nodes); # stay on current node if possible (avoids random migrations) diff --git a/src/PVE/HA/Rules/NodeAffinity.pm b/src/PVE/HA/Rules/NodeAffinity.pm index 5394832e..111ff6fe 100644 --- a/src/PVE/HA/Rules/NodeAffinity.pm +++ b/src/PVE/HA/Rules/NodeAffinity.pm @@ -237,11 +237,11 @@ my $get_resource_node_affinity_rule = sub { return $node_affinity_rule; }; -=head3 get_node_affinity($rules, $sid, $online_node_usage) +=head3 get_node_affinity($rules, $sid, $online_nodes) Returns a list of two hashes representing the node affinity of C<$sid> according to the node affinity rules in C<$rules> and the available nodes in -C<$online_node_usage>. +the C<$online_nodes> hash. The first hash is a hash set of available nodes, i.e. nodes where the resource C<$sid> is allowed to be assigned to, and the second hash is a hash set @@ -252,20 +252,20 @@ If there are no available nodes at all, returns C. =cut sub get_node_affinity : prototype($$$) { - my ($rules, $sid, $online_node_usage) = @_; + my ($rules, $sid, $online_nodes) = @_; my $node_affinity_rule = $get_resource_node_affinity_rule->($rules, $sid); # default to a node affinity rule with all available nodes if (!$node_affinity_rule) { - for my $node ($online_node_usage->list_nodes()) { + for my $node (keys %$online_nodes) { $node_affinity_rule->{nodes}->{$node} = { priority => 0 }; } } # add remaining nodes with low priority for non-strict node affinity rules if (!$node_affinity_rule->{strict}) { - for my $node ($online_node_usage->list_nodes()) { + for my $node (keys %$online_nodes) { next if defined($node_affinity_rule->{nodes}->{$node}); $node_affinity_rule->{nodes}->{$node} = { priority => -1 }; @@ -276,7 +276,7 @@ sub get_node_affinity : prototype($$$) { my $prioritized_nodes = {}; while (my ($node, $props) = each %{ $node_affinity_rule->{nodes} }) { - next if !$online_node_usage->contains_node($node); # node is offline + next if !defined($online_nodes->{$node}); # node is offline $allowed_nodes->{$node} = 1; $prioritized_nodes->{ $props->{priority} }->{$node} = 1; -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel