Skip to content

xapi_vm_migrate: Avoid duplicate, overly-strict CBT check on VDIs #6405

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

Merged
merged 1 commit into from
Apr 8, 2025
Merged

xapi_vm_migrate: Avoid duplicate, overly-strict CBT check on VDIs #6405

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
11 changes: 3 additions & 8 deletions ocaml/xapi/xapi_vm_migrate.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1778,14 +1778,6 @@ let assert_can_migrate ~__context ~vm ~dest ~live:_ ~vdi_map ~vif_map ~options
let vbds = Db.VM.get_VBDs ~__context ~self:vm in
let vms_vdis = List.filter_map (vdi_filter __context true) vbds in
check_vdi_map ~__context vms_vdis vdi_map ;
(* Prevent SXM when the VM has a VDI on which changed block tracking is enabled *)
List.iter
(fun vconf ->
let vdi = vconf.vdi in
if Db.VDI.get_cbt_enabled ~__context ~self:vdi then
raise Api_errors.(Server_error (vdi_cbt_enabled, [Ref.string_of vdi]))
)
vms_vdis ;
(* operations required for migration *)
let required_src_sr_operations = Smint.Feature.[Vdi_snapshot; Vdi_mirror] in
let required_dst_sr_operations =
Expand Down Expand Up @@ -1919,6 +1911,9 @@ let assert_can_migrate ~__context ~vm ~dest ~live:_ ~vdi_map ~vif_map ~options
)
) ;
(* check_vdi_map above has already verified that all VDIs are in the vdi_map *)
(* Previously there was also a check that none of the VDIs have CBT enabled.
This is unnecessary, we only need to check that none of the VDIs that
*will be moved* have CBT enabled. *)
assert_can_migrate_vdis ~__context ~vdi_map

let assert_can_migrate_sender ~__context ~vm ~dest ~live:_ ~vdi_map:_ ~vif_map:_
Expand Down
Loading