Skip to content

Commit 80a59e5

Browse files
robhoesBob Ball
authored andcommitted
CA-267831: Remove bad assert_can_boot_here call from intra-pool SXM
Instead of `reserve_memory_for_vm` we call `allocate_vm_to_host`, because the former calls `assert_can_boot_here` without taking into account that the storage is going to be migrated. It is an unnecessary check anyway, because it is preceded by assert_can_migrate, which does similar checks (but the right ones). Signed-off-by: Rob Hoes <[email protected]>
1 parent c15fad4 commit 80a59e5

File tree

1 file changed

+2
-2
lines changed

1 file changed

+2
-2
lines changed

ocaml/xapi/message_forwarding.ml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1728,8 +1728,8 @@ module Forward = functor(Local: Custom_actions.CUSTOM_ACTIONS) -> struct
17281728
* forward the call to the source. *)
17291729
let snapshot = Db.VM.get_record ~__context ~self:vm in
17301730
(fun ~local_fn ~__context ~vm op ->
1731-
reserve_memory_for_vm ~__context ~vm ~host ~snapshot ~host_op:`vm_migrate
1732-
(fun () -> forward_vm_op ~local_fn ~__context ~vm op))
1731+
allocate_vm_to_host ~__context ~vm ~host ~snapshot ~host_op:`vm_migrate ();
1732+
forward_vm_op ~local_fn ~__context ~vm op)
17331733
else
17341734
(* Cross pool: just forward to the source host. Resources on the
17351735
* destination will be reserved separately. *)

0 commit comments

Comments
 (0)