Skip to content

CA-423816 avoid double counting VM overhead memory #7005

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

Open
lindig wants to merge 2 commits into
base: master
Choose a base branch
from
Open

CA-423816 avoid double counting VM overhead memory #7005

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
aef2acf
CA-423816 avoid double counting VM overhead memory
lindig Apr 10, 2026
29955aa
CA-423816 disable workaround in quicktest
lindig Apr 10, 2026
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
2 changes: 1 addition & 1 deletion ocaml/quicktest/quicktest_vm_memory.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ let check_tasks tasks =
let one t ~host ~vm ~workload_vm n =
Trace.with_ __FUNCTION__ @@ fun scope ->
workload t ~host ~workload_vm ;
let vms = fill_mem_n t ~workaround_migration:true ~host ~vm ~n in
let vms = fill_mem_n t ~workaround_migration:false ~host ~vm ~n in

let migration_host, migration_vm = List.nth vms 0 in

Expand Down
9 changes: 6 additions & 3 deletions ocaml/xenopsd/xc/xenops_server_xen.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1852,13 +1852,16 @@ module VM = struct
"VM = %s; using memory_dynamic_min = %Ld and \
memory_dynamic_max = %Ld"
vm.Vm.id vm.memory_dynamic_min vm.memory_dynamic_max ;
(vm.memory_dynamic_min, vm.memory_dynamic_max, None)
( vm.memory_dynamic_min +++ overhead_bytes
, vm.memory_dynamic_max +++ overhead_bytes
, None
)
)
in
let min_kib = kib_of_bytes_used (min_bytes +++ overhead_bytes)
let min_kib = kib_of_bytes_used min_bytes
and memory_total_source_kib =
Option.map kib_of_bytes_used memory_total_source_bytes
and max_kib = kib_of_bytes_used (max_bytes +++ overhead_bytes) in
and max_kib = kib_of_bytes_used max_bytes in
(* XXX: we would like to be able to cancel an in-progress
with_reservation *)
let dbg = Xenops_task.get_dbg task in
Expand Down
Loading