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 349F51FF141 for ; Mon, 30 Mar 2026 09:41:16 +0200 (CEST) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id 6BF3018DD4; Mon, 30 Mar 2026 09:41:42 +0200 (CEST) Mime-Version: 1.0 Content-Transfer-Encoding: quoted-printable Content-Type: text/plain; charset=UTF-8 Date: Mon, 30 Mar 2026 09:41:05 +0200 Message-Id: Subject: Re: [PATCH ha-manager v2 27/40] usage: pass service data to add_service_usage From: "Daniel Kral" To: "Dominik Rusovac" , X-Mailer: aerc 0.21.0-38-g7088c3642f2c-dirty References: <20260324183029.1274972-1-d.kral@proxmox.com> <20260324183029.1274972-28-d.kral@proxmox.com> In-Reply-To: X-Bm-Milter-Handled: 55990f41-d878-4baa-be0a-ee34c49e34d2 X-Bm-Transport-Timestamp: 1774856411902 X-SPAM-LEVEL: Spam detection results: 0 AWL -1.442 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 1 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 1 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 1 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 Message-ID-Hash: 6P4FPDFSXAII3VGSMR56JP5GVPJYIIUN X-Message-ID-Hash: 6P4FPDFSXAII3VGSMR56JP5GVPJYIIUN 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: On Mon Mar 30, 2026 at 9:34 AM CEST, Dominik Rusovac wrote: > see comment inline, otherwise lgtm > > On Tue Mar 24, 2026 at 7:30 PM CET, Daniel Kral wrote: >> 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 >> --- >> changes v1 -> v2: >> - new! >> >> 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 421c17da..d4b75ca9 100644 >> --- a/src/PVE/HA/Manager.pm >> +++ b/src/PVE/HA/Manager.pm >> @@ -281,17 +281,17 @@ sub recompute_online_node_usage { >> foreach my $sid (sort keys %{ $self->{ss} }) { >> my $sd =3D $self->{ss}->{$sid}; >> =20 >> - $online_node_usage->add_service_usage($sid, $sd->{state}, $sd->= {node}, $sd->{target}); >> + $online_node_usage->add_service_usage($sid, $sd); >> } >> =20 >> # add remaining non-HA resources to online node usage >> for my $sid (sort keys %$service_stats) { >> next if $self->{ss}->{$sid}; >> =20 >> - my ($node, $state) =3D $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, unde= f); >> + my $sd =3D { $service_stats->%{qw(node state)} }; > > shouldn't this be: > > my $sd =3D { $service_stats->{$sid}->%{qw(node state)} }; > > ? Good catch, thanks! I think this was left over because I wanted to my $service_stats =3D $service_stats->{$sid}; but this would be quite confusing with the variable shadowing here. >> + >> + $online_node_usage->add_service_usage($sid, $sd); >> } >> =20 > > [snip] > > Reviewed-by: Dominik Rusovac