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 36B301FF187 for ; Mon, 20 Oct 2025 18:45:34 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id CA723DA23; Mon, 20 Oct 2025 18:45:51 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Date: Mon, 20 Oct 2025 18:45:35 +0200 Message-ID: <20251020164540.517231-10-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20251020164540.517231-1-d.kral@proxmox.com> References: <20251020164540.517231-1-d.kral@proxmox.com> MIME-Version: 1.0 X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1760978738971 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 v2 5/8] manager: make recompute_online_node_usage use add_service_usage helper 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" As the previously introduced get_used_service_nodes(...) helper reflects the same logic as in recompute_online_node_usage(...), introduce a new helper add_service_usage(...), which adds service usage according to the nodes returned by get_used_service_nodes(...). This helper will also be used by a later patch, which introduces granular changes to $online_node_usage in change_service_state(...). Signed-off-by: Daniel Kral --- changes since v1: - introduce add_service_usage(...) instead of using get_used_service_nodes(...) and add_service_usage_to_node(...) directly - this makes $online_nodes an array again instead of creating a hash - reverted back the original foreach my ... - did not add R-b from Fiona as it wasn't discussed src/PVE/HA/Manager.pm | 40 ++-------------------------------------- src/PVE/HA/Usage.pm | 15 +++++++++++++++ 2 files changed, 17 insertions(+), 38 deletions(-) diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm index a71de167..bf6895ad 100644 --- a/src/PVE/HA/Manager.pm +++ b/src/PVE/HA/Manager.pm @@ -279,44 +279,8 @@ sub recompute_online_node_usage { foreach my $sid (sort keys %{ $self->{ss} }) { my $sd = $self->{ss}->{$sid}; - my $state = $sd->{state}; - my $target = $sd->{target}; # optional - if ($online_node_usage->contains_node($sd->{node})) { - if ( - $state eq 'started' - || $state eq 'request_stop' - || $state eq 'fence' - || $state eq 'freeze' - || $state eq 'error' - || $state eq 'recovery' - ) { - $online_node_usage->add_service_usage_to_node($sd->{node}, $sid, $sd->{node}); - } elsif ( - $state eq 'migrate' - || $state eq 'relocate' - || $state eq 'request_start_balance' - ) { - my $source = $sd->{node}; - # count it for both, source and target as load is put on both - if ($state ne 'request_start_balance') { - $online_node_usage->add_service_usage_to_node($source, $sid, $source, $target); - } - if ($online_node_usage->contains_node($target)) { - $online_node_usage->add_service_usage_to_node($target, $sid, $source, $target); - } - } elsif ($state eq 'stopped' || $state eq 'request_start') { - # do nothing - } else { - die "should not be reached (sid = '$sid', state = '$state')"; - } - } elsif (defined($target) && $online_node_usage->contains_node($target)) { - if ($state eq 'migrate' || $state eq 'relocate') { - # to correctly track maintenance modi and also consider the target as used for the - # case a node dies, as we cannot really know if the to-be-aborted incoming migration - # has already cleaned up all used resources - $online_node_usage->add_service_usage_to_node($target, $sid, $sd->{node}, $target); - } - } + + $online_node_usage->add_service_usage($sid, $sd->{state}, $sd->{node}, $sd->{target}); } $self->{online_node_usage} = $online_node_usage; diff --git a/src/PVE/HA/Usage.pm b/src/PVE/HA/Usage.pm index edea2545..e3725c92 100644 --- a/src/PVE/HA/Usage.pm +++ b/src/PVE/HA/Usage.pm @@ -40,6 +40,21 @@ sub add_service_usage_to_node { die "implement in subclass"; } +# Adds service $sid's usage to the online nodes according to their $state, +# $service_node and $migration_target. +sub add_service_usage { + my ($self, $sid, $service_state, $service_node, $migration_target) = @_; + + my $online_nodes = { map { $_ => 1 } $self->list_nodes() }; + my ($current_node, $target_node) = + get_used_service_nodes($online_nodes, $service_state, $service_node, $migration_target); + + $self->add_service_usage_to_node($current_node, $sid, $service_node, $migration_target) + if $current_node; + $self->add_service_usage_to_node($target_node, $sid, $service_node, $migration_target) + if $target_node; +} + # Returns a hash with $nodename => $score pairs. A lower $score is better. sub score_nodes_to_start_service { my ($self, $sid, $service_node) = @_; -- 2.47.3 _______________________________________________ pve-devel mailing list pve-devel@lists.proxmox.com https://lists.proxmox.com/cgi-bin/mailman/listinfo/pve-devel