From 936e5b91766bfe8f8a91492380e65ef3bdf84ffb Mon Sep 17 00:00:00 2001 From: Pau Ruiz Safont Date: Mon, 30 Sep 2024 17:22:09 +0100 Subject: [PATCH] VM shutdowns: do not block the calls to the domains prematurely Just because a domain is not advertising it can shutdown cooperatively doesn't mean it can't at all. Try to shut them down in any case. Signed-off-by: Pau Ruiz Safont --- ocaml/xapi/message_forwarding.ml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/ocaml/xapi/message_forwarding.ml b/ocaml/xapi/message_forwarding.ml index cbbbdb1f078..ced4e91677a 100644 --- a/ocaml/xapi/message_forwarding.ml +++ b/ocaml/xapi/message_forwarding.ml @@ -2054,7 +2054,7 @@ functor info "VM.clean_shutdown: VM = '%s'" (vm_uuid ~__context vm) ; let local_fn = Local.VM.clean_shutdown ~vm in with_vm_operation ~__context ~self:vm ~doc:"VM.clean_shutdown" - ~op:`clean_shutdown (fun () -> + ~op:`clean_shutdown ~strict:false (fun () -> forward_vm_op ~local_fn ~__context ~vm (fun session_id rpc -> Client.VM.clean_shutdown ~rpc ~session_id ~vm ) @@ -2073,7 +2073,7 @@ functor info "VM.shutdown: VM = '%s'" (vm_uuid ~__context vm) ; let local_fn = Local.VM.shutdown ~vm in with_vm_operation ~__context ~self:vm ~doc:"VM.shutdown" ~op:`shutdown - (fun () -> + ~strict:false (fun () -> if Db.VM.get_power_state ~__context ~self:vm = `Suspended then ( debug "VM '%s' is suspended. Shutdown will just delete suspend VDI"