Augment the service stats with the node and state information, which is necessary for non-HA resources to be added to the service-node accounting done by the implementations of PVE::HA::Usage in an upcoming patch.
Signed-off-by: Daniel Kral <[email protected]> --- src/PVE/HA/Env/PVE2.pm | 44 +++++++++++++++++++++++++++++++------- src/PVE/HA/Sim/Hardware.pm | 27 ++++++++++++++++++++++- src/PVE/HA/Usage/Static.pm | 2 +- 3 files changed, 63 insertions(+), 10 deletions(-) diff --git a/src/PVE/HA/Env/PVE2.pm b/src/PVE/HA/Env/PVE2.pm index 87b1435a..c43cf3ca 100644 --- a/src/PVE/HA/Env/PVE2.pm +++ b/src/PVE/HA/Env/PVE2.pm @@ -502,24 +502,52 @@ 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"} // []; + # status can be any QMP RunState, but 'running' is the only active VM state + my $status = $rrdentry->[2] // "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 $sid = "$type:$id"; 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 a7e28c8a..4b4a187f 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
