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 98C7D1FF137 for ; Tue, 17 Feb 2026 15:16:35 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id C46783D53; Tue, 17 Feb 2026 15:15:29 +0100 (CET) From: Daniel Kral To: pve-devel@lists.proxmox.com Subject: [RFC ha-manager 05/21] derive static service stats while filling the service stats repository Date: Tue, 17 Feb 2026 15:14:12 +0100 Message-ID: <20260217141437.584852-19-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260217141437.584852-1-d.kral@proxmox.com> References: <20260217141437.584852-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: 1771337677320 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.020 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: UWIPY6MIK5AXNEWYUSSVPCYREOAFQETH X-Message-ID-Hash: UWIPY6MIK5AXNEWYUSSVPCYREOAFQETH 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: This is needed to be able to derive the proper static service stats for non-HA resources in a following patch as well. Signed-off-by: Daniel Kral --- src/PVE/HA/Env/PVE2.pm | 14 ++++++++------ src/PVE/HA/Resources.pm | 6 ++++++ src/PVE/HA/Resources/PVECT.pm | 12 ++++++++---- src/PVE/HA/Resources/PVEVM.pm | 12 ++++++++---- 4 files changed, 30 insertions(+), 14 deletions(-) diff --git a/src/PVE/HA/Env/PVE2.pm b/src/PVE/HA/Env/PVE2.pm index ee4fa23d..78ece447 100644 --- a/src/PVE/HA/Env/PVE2.pm +++ b/src/PVE/HA/Env/PVE2.pm @@ -518,17 +518,19 @@ sub update_static_service_stats { my $properties = ['cores', 'cpulimit', 'memory', 'sockets', 'vcpus']; my $service_stats = eval { - my $stats = PVE::Cluster::get_guest_config_properties($properties); + my $stats = {}; + my $confs = PVE::Cluster::get_guest_config_properties($properties); - # get_guest_config_properties(...) doesn't add guests which do not - # specify any of the given properties, but we need to make a distinction - # between "not cached" and "not specified" here my $vmlist = PVE::Cluster::get_vmlist(); my $idlist = $vmlist->{ids} // {}; for my $id (keys %$idlist) { - next if defined($stats->{$id}); + my $type = eval { PVE::HA::Tools::get_ha_resource_type($idlist->{$id}->{type}) }; + next if $@; # silently ignore unknown pve types - $stats->{$id} = {}; + my $conf = $confs->{$id} // {}; + my $plugin = PVE::HA::Resources->lookup($type); + + $stats->{$id} = $plugin->get_static_stats_from_config($conf); } return $stats; diff --git a/src/PVE/HA/Resources.pm b/src/PVE/HA/Resources.pm index 38e0841b..c40c260f 100644 --- a/src/PVE/HA/Resources.pm +++ b/src/PVE/HA/Resources.pm @@ -176,6 +176,12 @@ sub remove_locks { die "implement in subclass"; } +sub get_static_stats_from_config { + my ($class, $conf) = @_; + + die "implement in subclass"; +} + sub get_static_stats { my ($class, $haenv, $id) = @_; diff --git a/src/PVE/HA/Resources/PVECT.pm b/src/PVE/HA/Resources/PVECT.pm index 1f4eb2e9..0dc500d1 100644 --- a/src/PVE/HA/Resources/PVECT.pm +++ b/src/PVE/HA/Resources/PVECT.pm @@ -159,10 +159,8 @@ sub remove_locks { return undef; } -sub get_static_stats { - my ($class, $haenv, $id) = @_; - - my $conf = $haenv->get_static_service_stats($id); +sub get_static_stats_from_config { + my ($class, $conf) = @_; return { maxcpu => PVE::LXC::Config->get_derived_property($conf, 'max-cpu'), @@ -170,4 +168,10 @@ sub get_static_stats { }; } +sub get_static_stats { + my ($class, $haenv, $id) = @_; + + return $haenv->get_static_service_stats($id); +} + 1; diff --git a/src/PVE/HA/Resources/PVEVM.pm b/src/PVE/HA/Resources/PVEVM.pm index 760259e4..579a7fca 100644 --- a/src/PVE/HA/Resources/PVEVM.pm +++ b/src/PVE/HA/Resources/PVEVM.pm @@ -180,10 +180,8 @@ sub remove_locks { return undef; } -sub get_static_stats { - my ($class, $haenv, $id) = @_; - - my $conf = $haenv->get_static_service_stats($id); +sub get_static_stats_from_config { + my ($class, $conf) = @_; return { maxcpu => PVE::QemuConfig->get_derived_property($conf, 'max-cpu'), @@ -191,4 +189,10 @@ sub get_static_stats { }; } +sub get_static_stats { + my ($class, $haenv, $id) = @_; + + return $haenv->get_static_service_stats($id); +} + 1; -- 2.47.3