Merge pull request #5510 from LunfanZhang/private/luzhan/CP-48430

CP-48430 Update the running_domains metrics to include the blocked state domains
xapi-project · Mar 14, 2024 · 0f6163e · 0f6163e
2 parents 9b94769 + d50b592
commit 0f6163e
Showing 1 changed file with 5 additions and 3 deletions.
diff --git a/ocaml/xcp-rrdd/bin/rrdd/xcp_rrdd.ml b/ocaml/xcp-rrdd/bin/rrdd/xcp_rrdd.ml
@@ -361,9 +361,11 @@ let dss_loadavg () =
     )
   ]
 
-let count_running_domain domains =
+let count_power_state_running_domains domains =
   List.fold_left
-    (fun count (dom, _, _) -> if dom.Xenctrl.running then count + 1 else count)
+    (fun count (dom, _, _) ->
+      if not dom.Xenctrl.paused then count + 1 else count
+    )
     0 domains
 
 let dss_hostload xc domains =
@@ -386,7 +388,7 @@ let dss_hostload xc domains =
       )
       0 domains
   in
-  let running_domains = count_running_domain domains in
+  let running_domains = count_power_state_running_domains domains in
 
   let load_per_cpu = float_of_int load /. float_of_int pcpus in
   [