[PATCH ha-manager v2 09/14] sim: hardware: report actual running state in cluster service stats

[Michael Ryom <Michael@RyomHerold.dk>]

The simulated cluster service stats reported a service as running
whenever its request state was 'started', even before the LRM actually
started it. On the real cluster, the 'running' flag of the service
stats is derived from the actual RRD status of the guest, and the node
usage stats only contain load of actually running guests.

Report the running state as marked by the LRM in the node service
status instead, so that the service stats and the node usage stats of
the simulated hardware are consistent with each other, like they are on
the real cluster.

Signed-off-by: Michael Ryom <Michael@RyomHerold.dk>
---
 src/PVE/HA/Sim/Hardware.pm | 9 ++++++++-
 1 file changed, 8 insertions(+), 1 deletion(-)

diff --git a/src/PVE/HA/Sim/Hardware.pm b/src/PVE/HA/Sim/Hardware.pm
index e1a9ddd..538bc4e 100644
--- a/src/PVE/HA/Sim/Hardware.pm
+++ b/src/PVE/HA/Sim/Hardware.pm
@@ -1198,6 +1198,9 @@ sub watchdog_update {
 my sub get_cluster_service_stats {
     my ($self) = @_;
 
+    my $cstatus = $self->read_hardware_status_nolock();
+    my $node_service_status = { map { $_ => $self->read_service_status($_) } keys %$cstatus };
+
     my $stats = {};
     for my $sid (keys $self->{service_config}->%*) {
         my $cfg = $self->{service_config}->{$sid};
@@ -1205,7 +1208,11 @@ my sub get_cluster_service_stats {
         $stats->{$sid} = {
             node => $cfg->{node},
             state => $cfg->{state},
-            running => $cfg->{state} eq 'started',
+            # like the RRD-based stats on the real cluster, report whether
+            # the service is actually running (as marked by the LRM), not
+            # whether its request state is 'started'; the node usage stats
+            # only account for actually running services as well
+            running => $node_service_status->{ $cfg->{node} }->{$sid} ? 1 : 0,
             usage => {},
         };
     }
-- 
2.47.3