Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

rrdd: do not half-update the metrics' datastructures of paused vms #6194

Closed
wants to merge 1 commit into from
Closed

rrdd: do not half-update the metrics' datastructures of paused vms #6194

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
21 changes: 11 additions & 10 deletions ocaml/xcp-rrdd/bin/rrdd/rrdd_monitor.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -227,20 +227,21 @@ let update_rrds uuid_domids paused_vms plugins_dss =
(* First, potentially update the rrd with any new default dss *)
match vm_rrd with
| Some rrdi ->
let updated_dss, rrd = merge_new_dss rrdi dss in
(* CA-34383: Memory updates from paused domains serve no useful
purpose. During a migrate such updates can also cause undesirable
discontinuities in the observed value of memory_actual. Hence, we
ignore changes from paused domains: *)
( if not (StringSet.mem vm_uuid paused_vms) then
let named_updates =
StringMap.map to_named_updates dss
in
Rrd.ds_update_named rrd
~new_rrd:(domid <> rrdi.domid) timestamp
named_updates
) ;
Some {rrd; dss= updated_dss; domid}
if StringSet.mem vm_uuid paused_vms then
Some rrdi
else
let named_updates =
StringMap.map to_named_updates dss
in
let dss, rrd = merge_new_dss rrdi dss in
Rrd.ds_update_named rrd
~new_rrd:(domid <> rrdi.domid) timestamp
named_updates ;
Some {rrd; dss; domid}
| None ->
debug "%s: Creating fresh RRD for VM uuid=%s"
__FUNCTION__ vm_uuid ;
Expand Down
Loading