Skip to content

xenvm-local-allocator: it should be Error Retry, not `Retry #53

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

xenvm-local-allocator: it should be Error Retry, not `Retry #53

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
6 changes: 3 additions & 3 deletions xenvm-local-allocator/local_allocator.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,12 +25,12 @@ let rec try_forever msg f =
f ()
>>= function
| `Ok x -> return (`Ok x)
| `Error x -> return (`Error x)
| `Retry ->
| `Error `Retry ->
debug "%s: retrying after 5s" msg;
Lwt_unix.sleep 5.
>>= fun () ->
try_forever msg f
| `Error x -> return (`Error x)

(* This error must cause the system to stop for manual maintenance.
Perhaps we could scope this later and take down only a single connection? *)
Expand Down Expand Up @@ -267,7 +267,7 @@ let stat x =
| Some x -> return (`Ok x)
| None ->
error "The device mapper device %s has disappeared." x;
return `Retry
return (`Error `Retry)

let main config daemon socket journal fromLVM toLVM =
let config = Config.t_of_sexp (Sexplib.Sexp.load_sexp config) in
Expand Down