Skip to content

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

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 24, 2025
Merged

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

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: 6 additions & 5 deletions ocaml/xapi/vm_sysprep.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -209,7 +209,6 @@ let find_vdi ~__context ~label =
file. *)
let trigger ~domid ~uuid ~timeout =
let open Ezxenstore_core.Xenstore in
let module Watch = Ezxenstore_core.Watch in
let control = Printf.sprintf "/local/domain/%Ld/control/sysprep" domid in
let domain = Printf.sprintf "/local/domain/%Ld" domid in
with_xs (fun xs ->
Expand All @@ -219,17 +218,19 @@ let trigger ~domid ~uuid ~timeout =
debug "%s: notified domain %Ld" __FUNCTION__ domid ;
try
(* wait for sysprep to start, then domain to dissapear *)
Watch.(
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__ ;
Watch.(wait_for ~xs ~timeout (key_to_disappear (control // "action"))) ;
Ezxenstore_core.Watch.(
wait_for ~xs ~timeout (key_to_disappear (control // "action"))
) ;
debug "%s sysprep is finished" __FUNCTION__ ;
Watch.(wait_for ~xs ~timeout (key_to_disappear domain)) ;
Ezxenstore_core.Watch.(wait_for ~xs ~timeout (key_to_disappear domain)) ;
true
with Watch.Timeout _ ->
with Ezxenstore_core.Watch.Timeout _ ->
debug "%s: sysprep timeout" __FUNCTION__ ;
false
)
Expand Down
Loading