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 502491FF13C for ; Thu, 19 Mar 2026 17:41:40 +0100 (CET) Received: from firstgate.proxmox.com (localhost [127.0.0.1]) by firstgate.proxmox.com (Proxmox) with ESMTP id AB9826757; Thu, 19 Mar 2026 17:41:33 +0100 (CET) From: Daniel Kral To: pve-devel@lists.proxmox.com Subject: [PATCH ha-manager v2 09/10] usage: augment service stats with node and state information Date: Thu, 19 Mar 2026 17:33:59 +0100 Message-ID: <20260319164047.642936-10-d.kral@proxmox.com> X-Mailer: git-send-email 2.47.3 In-Reply-To: <20260319164047.642936-1-d.kral@proxmox.com> References: <20260319164047.642936-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: 1773938408364 X-SPAM-LEVEL: Spam detection results: 0 AWL 0.052 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: ZS4JZQPCQO4IE3VX4SV2HM5PYUQ46SQG X-Message-ID-Hash: ZS4JZQPCQO4IE3VX4SV2HM5PYUQ46SQG 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: Augment the service stats with the node and state information, which is necessary for non-HA resources to be added to the accounting done by the implementations of PVE::HA::Usage in an upcoming patch. Signed-off-by: Daniel Kral --- src/PVE/HA/Env/PVE2.pm | 49 +++++++++++++++++++++++++++++++------- src/PVE/HA/Sim/Hardware.pm | 27 ++++++++++++++++++++- src/PVE/HA/Usage/Static.pm | 2 +- 3 files changed, 68 insertions(+), 10 deletions(-) diff --git a/src/PVE/HA/Env/PVE2.pm b/src/PVE/HA/Env/PVE2.pm index 9c64d955..b544de4c 100644 --- a/src/PVE/HA/Env/PVE2.pm +++ b/src/PVE/HA/Env/PVE2.pm @@ -38,6 +38,12 @@ PVE::HA::Rules->init(property_isolation => 1); my $lockdir = "/etc/pve/priv/lock"; +# rrd entry indices for VM and CT guests +# taken from PVE::Service::pvestatd::update_{lxc,qemu}_status() +use constant { + RRD_VM_INDEX_STATUS => 2, +}; + sub new { my ($this, $nodename) = @_; @@ -507,24 +513,51 @@ sub get_datacenter_settings { }; } -sub get_static_service_stats { - my ($self) = @_; - - my $properties = ['cores', 'cpulimit', 'memory', 'sockets', 'vcpus']; - my $stats = {}; - my $confs = PVE::Cluster::get_guest_config_properties($properties); - +my sub get_cluster_service_stats { my $vmlist = PVE::Cluster::get_vmlist(); my $idlist = $vmlist->{ids} // {}; + + my $rrd = PVE::Cluster::rrd_dump(); + + my $stats = {}; for my $id (keys %$idlist) { my $type = eval { PVE::HA::Tools::get_ha_resource_type($idlist->{$id}->{type}) }; next if $@; # silently ignore unknown pve types my $sid = "$type:$id"; + my $nodename = $idlist->{$id}->{node}; + + my $rrdentry = $rrd->{"pve-vm-9.0/$id"} // []; + # can be any QMP RunState, but 'running' is the only active VM state + my $status = $rrdentry->[RRD_VM_INDEX_STATUS] // "stopped"; + my $state = $status eq "running" ? "started" : "stopped"; + + $stats->{$sid} = { + id => $id, + node => $nodename, + state => $state, + type => $type, + usage => {}, + }; + } + + return $stats; +} + +sub get_static_service_stats { + my ($self) = @_; + + my $properties = ['cores', 'cpulimit', 'memory', 'sockets', 'vcpus']; + my $stats = get_cluster_service_stats(); + my $confs = PVE::Cluster::get_guest_config_properties($properties); + + for my $sid (keys %$stats) { + my ($id, $type) = $stats->{$sid}->@{qw(id type)}; + my $conf = $confs->{$id} // {}; my $plugin = PVE::HA::Resources->lookup($type); - $stats->{$sid} = $plugin->get_static_stats_from_config($conf); + $stats->{$sid}->{usage} = $plugin->get_static_stats_from_config($conf); } return $stats; diff --git a/src/PVE/HA/Sim/Hardware.pm b/src/PVE/HA/Sim/Hardware.pm index 062d9846..dd7d277c 100644 --- a/src/PVE/HA/Sim/Hardware.pm +++ b/src/PVE/HA/Sim/Hardware.pm @@ -1060,13 +1060,38 @@ sub watchdog_update { return &$modify_watchog($self, $code); } +my sub get_cluster_service_stats { + my ($self) = @_; + + my $stats = {}; + for my $sid (keys $self->{service_config}->%*) { + my $cfg = $self->{service_config}->{$sid}; + + $stats->{$sid} = { + node => $cfg->{node}, + state => $cfg->{state}, + usage => {}, + }; + } + + return $stats; +} + sub get_static_service_stats { my ($self) = @_; + my $stats = get_cluster_service_stats($self); + my $filename = "$self->{statusdir}/static_service_stats"; - my $stats = eval { PVE::HA::Tools::read_json_from_file($filename) }; + my $usage_stats = eval { PVE::HA::Tools::read_json_from_file($filename) }; $self->log('warning', "unable to update static service stats cache - $@") if $@; + for my $sid (keys %$stats) { + next if !defined($usage_stats->{$sid}); + + $stats->{$sid}->{usage} = $usage_stats->{$sid}; + } + return $stats; } diff --git a/src/PVE/HA/Usage/Static.pm b/src/PVE/HA/Usage/Static.pm index 48622d62..98752691 100644 --- a/src/PVE/HA/Usage/Static.pm +++ b/src/PVE/HA/Usage/Static.pm @@ -66,7 +66,7 @@ sub contains_node { my sub get_service_usage { my ($self, $sid) = @_; - my $service_stats = $self->{'service-stats'}->{$sid} + my $service_stats = $self->{'service-stats'}->{$sid}->{usage} or die "did not get static service usage information for '$sid'\n"; return $service_stats; -- 2.47.3