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 619EC1FF13C for ; Thu, 02 Apr 2026 14:49:04 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id A7FBE16D61; Thu, 2 Apr 2026 14:48:41 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Subject: [PATCH ha-manager v4 11/28] usage: pass service data to add_service_usage Date: Thu, 2 Apr 2026 14:44:05 +0200 Message-ID: <20260402124817.416232-12-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260402124817.416232-1-d.kral@proxmox.com> References: <20260402124817.416232-1-d.kral@proxmox.com> MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1775134043175 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.082 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 Message-ID-Hash: QXD6LJ2D7K3VTDZXTT5PJZVLLNTLWCS2 X-Message-ID-Hash: QXD6LJ2D7K3VTDZXTT5PJZVLLNTLWCS2 X-MailFrom: d.kral@proxmox.com X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; loop; banned-address; emergency; member-moderation; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.10 Precedence: list List-Id: Proxmox VE development discussion List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The method is already dependent on three members of the service data and in a following patch a fourth member is needed for adding more information to the Usage implementations. Signed-off-by: Daniel Kral Reviewed-by: Dominik Rusovac --- changes v3 -> v4: - none src/PVE/HA/Manager.pm | 11 +++++------ src/PVE/HA/Usage.pm | 6 +++--- 2 files changed, 8 insertions(+), 9 deletions(-) diff --git a/src/PVE/HA/Manager.pm b/src/PVE/HA/Manager.pm index fbc7f931..71f45b5c 100644 --- a/src/PVE/HA/Manager.pm +++ b/src/PVE/HA/Manager.pm @@ -284,17 +284,17 @@ sub recompute_online_node_usage { foreach my $sid (sort keys %{ $self->{ss} }) { my $sd = $self->{ss}->{$sid}; - $online_node_usage->add_service_usage($sid, $sd->{state}, $sd->{node}, $sd->{target}); + $online_node_usage->add_service_usage($sid, $sd); } # add remaining non-HA resources to online node usage for my $sid (sort keys %$service_stats) { next if $self->{ss}->{$sid}; - my ($node, $state) = $service_stats->{$sid}->@{qw(node state)}; - # the migration target is not known for non-HA resources - $online_node_usage->add_service_usage($sid, $state, $node, undef); + my $sd = { $service_stats->{$sid}->%{qw(node state)} }; + + $online_node_usage->add_service_usage($sid, $sd); } $self->{online_node_usage} = $online_node_usage; @@ -332,8 +332,7 @@ my $change_service_state = sub { } $self->{online_node_usage}->remove_service_usage($sid); - $self->{online_node_usage} - ->add_service_usage($sid, $sd->{state}, $sd->{node}, $sd->{target}); + $self->{online_node_usage}->add_service_usage($sid, $sd); $sd->{uid} = compute_new_uuid($new_state); diff --git a/src/PVE/HA/Usage.pm b/src/PVE/HA/Usage.pm index 9f19a82b..6d53f956 100644 --- a/src/PVE/HA/Usage.pm +++ b/src/PVE/HA/Usage.pm @@ -40,12 +40,12 @@ 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. +# Adds service $sid's usage to the online nodes according to their service data $sd. sub add_service_usage { - my ($self, $sid, $service_state, $service_node, $migration_target) = @_; + my ($self, $sid, $sd) = @_; my $online_nodes = { map { $_ => 1 } $self->list_nodes() }; + my ($service_state, $service_node, $migration_target) = $sd->@{qw(state node target)}; my ($current_node, $target_node) = get_used_service_nodes($online_nodes, $service_state, $service_node, $migration_target); -- 2.47.3