Skip to content

xenvm shutdown: block until the daemon has gone #58

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 30, 2015
Merged

xenvm shutdown: block until the daemon has gone #58

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
21 changes: 19 additions & 2 deletions xenvm/xenvm.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -139,8 +139,25 @@ let host_list config =

let shutdown config =
set_uri config None;
Lwt_main.run
(Client.shutdown ())
let t =
Client.shutdown ()
>>= fun () ->
(* wait for the daemon to disappear *)
let finished = ref false in
let rec wait () =
Lwt.catch
(fun () ->
Client.Host.all ()
>>= fun _ ->
Printf.fprintf stderr "Xenvmd is still alive: will sleep 5s and try again\n%!";
Lwt_unix.sleep 5.
) (fun _ ->
finished := true;
return ())
>>= fun () ->
if !finished then return () else wait () in
wait () in
Lwt_main.run t

let benchmark config =
set_uri config None;
Expand Down