Skip to content

CP-308455 VM.sysprep CA-414158 wait for "action" key to disappear #6606

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
Jul 29, 2025
+31 −19
Merged

CP-308455 VM.sysprep CA-414158 wait for "action" key to disappear #6606

Show file tree
Hide file tree
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
47 changes: 28 additions & 19 deletions ocaml/xapi/vm_sysprep.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ type error =
| API_not_enabled
| Other of string
| VM_CDR_not_found
| VM_CDR_eject
| VM_misses_feature
| VM_not_running
| VM_sysprep_timeout
Expand Down Expand Up @@ -205,9 +206,18 @@ let find_vdi ~__context ~label =
warn "%s: more than one VDI with label %s" __FUNCTION__ label ;
vdi

(* Ejecting the CD/VDI/ISO may fail with a timeout *)
let eject ~rpc ~session_id ~vbd ~iso =
try
Client.VBD.eject ~rpc ~session_id ~vbd ;
Sys.remove iso
with exn ->
warn "%s: ejecting CD failed: %s" __FUNCTION__ (Printexc.to_string exn) ;
fail VM_CDR_eject

(** notify the VM with [domid] to run sysprep and where to find the
file. *)
let trigger ~domid ~uuid ~timeout =
let trigger ~rpc ~session_id ~domid ~uuid ~timeout ~vbd ~iso =
let open Ezxenstore_core.Xenstore in
let control = Printf.sprintf "/local/domain/%Ld/control/sysprep" domid in
let domain = Printf.sprintf "/local/domain/%Ld" domid in
Expand All @@ -217,17 +227,21 @@ let trigger ~domid ~uuid ~timeout =
xs.Xs.write (control // "action") "sysprep" ;
debug "%s: notified domain %Ld" __FUNCTION__ domid ;
try
(* wait for sysprep to start, then domain to dissapear *)
Ezxenstore_core.Watch.(
wait_for ~xs ~timeout:5.0
(value_to_become (control // "action") "running")
) ;
debug "%s: sysprep is runnung; waiting for sysprep to finish"
__FUNCTION__ ;
Ezxenstore_core.Watch.(
wait_for ~xs ~timeout (key_to_disappear (control // "action"))
) ;
debug "%s sysprep is finished" __FUNCTION__ ;
finally
(fun () ->
(* wait for sysprep to start, then domain to dissapear *)
Ezxenstore_core.Watch.(
wait_for ~xs ~timeout:5.0
(value_to_become (control // "action") "running")
) ;
debug "%s: sysprep is running; waiting for sysprep to finish"
__FUNCTION__ ;
Ezxenstore_core.Watch.(
wait_for ~xs ~timeout (key_to_disappear (control // "action"))
)
)
(fun () -> eject ~rpc ~session_id ~vbd ~iso) ;
debug "%s waiting for domain to dissapear" __FUNCTION__ ;
Ezxenstore_core.Watch.(wait_for ~xs ~timeout (key_to_disappear domain)) ;
true
with Ezxenstore_core.Watch.Timeout _ ->
Expand Down Expand Up @@ -269,13 +283,8 @@ let sysprep ~__context ~vm ~unattend ~timeout =
call ~__context @@ fun rpc session_id ->
Client.VBD.insert ~rpc ~session_id ~vdi ~vbd ;
Thread.delay !Xapi_globs.vm_sysprep_wait ;
match trigger ~domid ~uuid ~timeout with
match trigger ~rpc ~session_id ~domid ~uuid ~timeout ~vbd ~iso with
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

the result is boolean if .. then .. can be used.

Suggested change
match trigger ~rpc ~session_id ~domid ~uuid ~timeout ~vbd ~iso with
if not (trigger ~rpc ~session_id ~domid ~uuid ~timeout ~vbd ~iso) then
fail VM_sysprep_timeout

| true ->
debug "%s: sysprep running, ejecting CD" __FUNCTION__ ;
Client.VBD.eject ~rpc ~session_id ~vbd ;
Sys.remove iso
()
| false ->
debug "%s: sysprep timeout, ejecting CD" __FUNCTION__ ;
Client.VBD.eject ~rpc ~session_id ~vbd ;
Sys.remove iso ;
fail VM_sysprep_timeout
1 change: 1 addition & 0 deletions ocaml/xapi/vm_sysprep.mli
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ type error =
| API_not_enabled
| Other of string
| VM_CDR_not_found
| VM_CDR_eject
| VM_misses_feature
| VM_not_running
| VM_sysprep_timeout
Expand Down
2 changes: 2 additions & 0 deletions ocaml/xapi/xapi_vm.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1725,6 +1725,8 @@ let sysprep ~__context ~self ~unattend ~timeout =
)
| exception Vm_sysprep.Sysprep VM_not_running ->
raise Api_errors.(Server_error (sysprep, [uuid; "VM is not running"]))
| exception Vm_sysprep.Sysprep VM_CDR_eject ->
raise Api_errors.(Server_error (sysprep, [uuid; "VM failed to eject CD"]))
| exception Vm_sysprep.Sysprep VM_sysprep_timeout ->
raise
Api_errors.(
Expand Down
Loading