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 714881FF13C for ; Thu, 02 Apr 2026 14:48:47 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 74F991689A; Thu, 2 Apr 2026 14:48:36 +0200 (CEST) From: Daniel Kral To: pve-devel@lists.proxmox.com Subject: [PATCH ha-manager v4 12/28] usage: pass service data to get_used_service_nodes Date: Thu, 2 Apr 2026 14:44:06 +0200 Message-ID: <20260402124817.416232-13-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: 1775134043239 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: 5AFRYBTLJQCUZTZI4WL7JJ55C5SWAS7C X-Message-ID-Hash: 5AFRYBTLJQCUZTZI4WL7JJ55C5SWAS7C 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: Remove some unnecessary destructuring syntax for the helper. Signed-off-by: Daniel Kral Reviewed-by: Dominik Rusovac --- changes v3 -> v4: - none src/PVE/HA/Rules/ResourceAffinity.pm | 3 +-- src/PVE/HA/Usage.pm | 13 ++++++------- 2 files changed, 7 insertions(+), 9 deletions(-) diff --git a/src/PVE/HA/Rules/ResourceAffinity.pm b/src/PVE/HA/Rules/ResourceAffinity.pm index 1c610430..474d3000 100644 --- a/src/PVE/HA/Rules/ResourceAffinity.pm +++ b/src/PVE/HA/Rules/ResourceAffinity.pm @@ -511,8 +511,7 @@ sub get_resource_affinity { my $get_used_service_nodes = sub { my ($sid) = @_; return (undef, undef) if !defined($ss->{$sid}); - my ($state, $node, $target) = $ss->{$sid}->@{qw(state node target)}; - return PVE::HA::Usage::get_used_service_nodes($online_nodes, $state, $node, $target); + return PVE::HA::Usage::get_used_service_nodes($online_nodes, $ss->{$sid}); }; for my $csid (keys $positive->%*) { diff --git a/src/PVE/HA/Usage.pm b/src/PVE/HA/Usage.pm index 6d53f956..be3e64d6 100644 --- a/src/PVE/HA/Usage.pm +++ b/src/PVE/HA/Usage.pm @@ -45,9 +45,7 @@ sub add_service_usage { 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); + my ($current_node, $target_node) = get_used_service_nodes($online_nodes, $sd); $self->add_service_usage_to_node($current_node, $sid) if $current_node; $self->add_service_usage_to_node($target_node, $sid) if $target_node; @@ -66,11 +64,12 @@ sub score_nodes_to_start_service { die "implement in subclass"; } -# Returns the current and target node as a two-element array, that a service -# puts load on according to the $online_nodes and the service's $state, $node -# and $target. +# Returns a two-element array of the nodes a service puts load on +# (current and target), given $online_nodes and service data $sd. sub get_used_service_nodes { - my ($online_nodes, $state, $node, $target) = @_; + my ($online_nodes, $sd) = @_; + + my ($state, $node, $target) = $sd->@{qw(state node target)}; return (undef, undef) if $state eq 'stopped' || $state eq 'request_start'; -- 2.47.3