vmmd: dump state (unikernel configurations) on create+destroy, restore from state on startup
This commit is contained in:
parent
1a288d2937
commit
c372c8405e
24
app/vmmd.ml
24
app/vmmd.ml
|
@ -149,6 +149,10 @@ let rec stats_loop () =
|
||||||
|
|
||||||
let jump _ =
|
let jump _ =
|
||||||
Sys.(set_signal sigpipe Signal_ignore);
|
Sys.(set_signal sigpipe Signal_ignore);
|
||||||
|
match Vmm_vmmd.restore_unikernels () with
|
||||||
|
| Error (`Msg msg) -> Logs.err (fun m -> m "bailing out: %s" msg)
|
||||||
|
| Ok old_unikernels ->
|
||||||
|
|
||||||
Lwt_main.run
|
Lwt_main.run
|
||||||
(server_socket `Vmmd >>= fun ss ->
|
(server_socket `Vmmd >>= fun ss ->
|
||||||
(create_mbox `Log >|= function
|
(create_mbox `Log >|= function
|
||||||
|
@ -159,8 +163,8 @@ let jump _ =
|
||||||
Lwt_mutex.with_lock self_destruct_mutex (fun () ->
|
Lwt_mutex.with_lock self_destruct_mutex (fun () ->
|
||||||
(if Vmm_vmmd.killall !state then
|
(if Vmm_vmmd.killall !state then
|
||||||
(* not too happy about the sleep here, but cleaning up resources
|
(* not too happy about the sleep here, but cleaning up resources
|
||||||
is really important (fifos, vm images, tap devices) - which is
|
is really important (fifos, vm images, tap devices) - which
|
||||||
done asynchronously (in the task waitpid() on the pid) *)
|
is done asynchronously (in the task waitpid() on the pid) *)
|
||||||
Lwt_unix.sleep 1.
|
Lwt_unix.sleep 1.
|
||||||
else
|
else
|
||||||
Lwt.return_unit) >>= fun () ->
|
Lwt.return_unit) >>= fun () ->
|
||||||
|
@ -226,11 +230,23 @@ let jump _ =
|
||||||
| Some fd ->
|
| Some fd ->
|
||||||
(* TODO should we terminate the connection on write failure? *)
|
(* TODO should we terminate the connection on write failure? *)
|
||||||
Vmm_lwt.write_wire fd wire >|= fun _ ->
|
Vmm_lwt.write_wire fd wire >|= fun _ ->
|
||||||
())
|
()) wires
|
||||||
wires
|
|
||||||
in
|
in
|
||||||
|
|
||||||
Lwt.async stats_loop ;
|
Lwt.async stats_loop ;
|
||||||
|
|
||||||
|
let start_unikernel (name, config) =
|
||||||
|
match Vmm_vmmd.handle_create !state [] name config with
|
||||||
|
| Error (`Msg msg) ->
|
||||||
|
Logs.err (fun m -> m "failed to restart %a: %s" Name.pp name msg) ;
|
||||||
|
Lwt.return_unit
|
||||||
|
| Ok (state', out, `Create next) ->
|
||||||
|
state := state' ;
|
||||||
|
process "create from dump" out >>= fun () ->
|
||||||
|
create process next
|
||||||
|
in
|
||||||
|
Lwt_list.iter_p start_unikernel (Vmm_trie.all old_unikernels) >>= fun () ->
|
||||||
|
|
||||||
Lwt.catch (fun () ->
|
Lwt.catch (fun () ->
|
||||||
let rec loop () =
|
let rec loop () =
|
||||||
Lwt_unix.accept ss >>= fun (fd, addr) ->
|
Lwt_unix.accept ss >>= fun (fd, addr) ->
|
||||||
|
|
|
@ -521,6 +521,42 @@ let logs_of_disk buf =
|
||||||
in
|
in
|
||||||
next [] buf
|
next [] buf
|
||||||
|
|
||||||
|
let trie e =
|
||||||
|
let f elts =
|
||||||
|
List.fold_left (fun trie (key, value) ->
|
||||||
|
match Name.of_string key with
|
||||||
|
| Error (`Msg m) -> invalid_arg m
|
||||||
|
| Ok name ->
|
||||||
|
let trie, ret = Vmm_trie.insert name value trie in
|
||||||
|
assert (ret = None);
|
||||||
|
trie) Vmm_trie.empty elts
|
||||||
|
and g trie =
|
||||||
|
List.map (fun (k, v) -> Name.to_string k, v) (Vmm_trie.all trie)
|
||||||
|
in
|
||||||
|
Asn.S.map f g @@
|
||||||
|
Asn.S.(sequence_of
|
||||||
|
(sequence2
|
||||||
|
(required ~label:"name" utf8_string)
|
||||||
|
(required ~label:"value" e)))
|
||||||
|
|
||||||
|
let version0_unikernels = trie unikernel_config
|
||||||
|
|
||||||
|
let unikernels =
|
||||||
|
(* the choice is the implicit version + migration... be aware when
|
||||||
|
any dependent data layout changes .oO(/o\) *)
|
||||||
|
let f = function
|
||||||
|
| `C1 () -> Asn.S.error (`Parse "shouldn't happen")
|
||||||
|
| `C2 data -> data
|
||||||
|
and g data =
|
||||||
|
`C2 data
|
||||||
|
in
|
||||||
|
Asn.S.map f g @@
|
||||||
|
Asn.S.(choice2
|
||||||
|
(explicit 0 null)
|
||||||
|
(explicit 1 version0_unikernels))
|
||||||
|
|
||||||
|
let unikernels_of_cstruct, unikernels_to_cstruct = projections_of unikernels
|
||||||
|
|
||||||
type cert_extension = version * t
|
type cert_extension = version * t
|
||||||
|
|
||||||
let cert_extension =
|
let cert_extension =
|
||||||
|
|
|
@ -25,3 +25,6 @@ type cert_extension = Vmm_commands.version * Vmm_commands.t
|
||||||
|
|
||||||
val cert_extension_of_cstruct : Cstruct.t -> (cert_extension, [> `Msg of string ]) result
|
val cert_extension_of_cstruct : Cstruct.t -> (cert_extension, [> `Msg of string ]) result
|
||||||
val cert_extension_to_cstruct : cert_extension -> Cstruct.t
|
val cert_extension_to_cstruct : cert_extension -> Cstruct.t
|
||||||
|
|
||||||
|
val unikernels_to_cstruct : Unikernel.config Vmm_trie.t -> Cstruct.t
|
||||||
|
val unikernels_of_cstruct : Cstruct.t -> (Unikernel.config Vmm_trie.t, [> `Msg of string ]) result
|
||||||
|
|
|
@ -54,6 +54,24 @@ let close_no_err fd = try close fd with _ -> ()
|
||||||
open Vmm_core
|
open Vmm_core
|
||||||
|
|
||||||
let dbdir = Fpath.(v "/var" / "db" / "albatross")
|
let dbdir = Fpath.(v "/var" / "db" / "albatross")
|
||||||
|
|
||||||
|
let dump, restore =
|
||||||
|
let open R.Infix in
|
||||||
|
let state_file = Fpath.(dbdir / "state") in
|
||||||
|
(fun data ->
|
||||||
|
Bos.OS.File.exists state_file >>= fun exists ->
|
||||||
|
(if exists then begin
|
||||||
|
let bak = Fpath.(state_file + "bak") in
|
||||||
|
Bos.OS.U.(error_to_msg @@ rename state_file bak)
|
||||||
|
end else Ok ()) >>= fun () ->
|
||||||
|
Bos.OS.File.write state_file (Cstruct.to_string data)),
|
||||||
|
(fun () ->
|
||||||
|
Bos.OS.File.exists state_file >>= fun exists ->
|
||||||
|
if exists then
|
||||||
|
Bos.OS.File.read state_file >>| fun data ->
|
||||||
|
Cstruct.of_string data
|
||||||
|
else Error `NoFile)
|
||||||
|
|
||||||
let blockdir = Fpath.(dbdir / "block")
|
let blockdir = Fpath.(dbdir / "block")
|
||||||
|
|
||||||
let block_file name =
|
let block_file name =
|
||||||
|
|
|
@ -20,3 +20,7 @@ val create_block : Name.t -> int -> (unit, [> R.msg ]) result
|
||||||
val destroy_block : Name.t -> (unit, [> R.msg ]) result
|
val destroy_block : Name.t -> (unit, [> R.msg ]) result
|
||||||
|
|
||||||
val find_block_devices : unit -> ((Name.t * int) list, [> R.msg ]) result
|
val find_block_devices : unit -> ((Name.t * int) list, [> R.msg ]) result
|
||||||
|
|
||||||
|
val dump : Cstruct.t -> (unit, [> R.msg ]) result
|
||||||
|
|
||||||
|
val restore : unit -> (Cstruct.t, [> R.msg | `NoFile ]) result
|
||||||
|
|
|
@ -16,10 +16,12 @@ type 'a t = {
|
||||||
waiters : 'a String.Map.t ;
|
waiters : 'a String.Map.t ;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
let in_shutdown = ref false
|
||||||
|
|
||||||
let killall t =
|
let killall t =
|
||||||
match List.map snd (Vmm_trie.all t.resources.Vmm_resources.unikernels) with
|
match List.map snd (Vmm_trie.all t.resources.Vmm_resources.unikernels) with
|
||||||
| [] -> false
|
| [] -> false
|
||||||
| vms -> List.iter Vmm_unix.destroy vms ; true
|
| vms -> in_shutdown := true ; List.iter Vmm_unix.destroy vms ; true
|
||||||
|
|
||||||
let waiter t id =
|
let waiter t id =
|
||||||
let name = Name.to_string id in
|
let name = Name.to_string id in
|
||||||
|
@ -80,6 +82,30 @@ let log t name event =
|
||||||
Logs.debug (fun m -> m "log %a" Log.pp data) ;
|
Logs.debug (fun m -> m "log %a" Log.pp data) ;
|
||||||
({ t with log_counter }, `Log (header, `Data (`Log_data data)))
|
({ t with log_counter }, `Log (header, `Data (`Log_data data)))
|
||||||
|
|
||||||
|
let restore_unikernels () =
|
||||||
|
match Vmm_unix.restore () with
|
||||||
|
| Error `NoFile ->
|
||||||
|
Logs.warn (fun m -> m "no state dump found, starting with no unikernels") ;
|
||||||
|
Ok Vmm_trie.empty
|
||||||
|
| Error (`Msg msg) -> Error (`Msg ("while reading state: " ^ msg))
|
||||||
|
| Ok data ->
|
||||||
|
match Vmm_asn.unikernels_of_cstruct data with
|
||||||
|
| Error (`Msg msg) -> Error (`Msg ("couldn't parse state: " ^ msg))
|
||||||
|
| Ok unikernels ->
|
||||||
|
Logs.info (fun m -> m "restored some unikernels") ;
|
||||||
|
Ok unikernels
|
||||||
|
|
||||||
|
let dump_unikernels t =
|
||||||
|
let unikernels = Vmm_trie.all t.resources.Vmm_resources.unikernels in
|
||||||
|
let trie = List.fold_left (fun t (name, unik) ->
|
||||||
|
fst @@ Vmm_trie.insert name unik.Unikernel.config t)
|
||||||
|
Vmm_trie.empty unikernels
|
||||||
|
in
|
||||||
|
let data = Vmm_asn.unikernels_to_cstruct trie in
|
||||||
|
match Vmm_unix.dump data with
|
||||||
|
| Error (`Msg msg) -> Logs.err (fun m -> m "failed to dump unikernels: %s" msg)
|
||||||
|
| Ok () -> Logs.info (fun m -> m "dumped current state")
|
||||||
|
|
||||||
let setup_stats t name vm =
|
let setup_stats t name vm =
|
||||||
let stat_out =
|
let stat_out =
|
||||||
let pid = vm.Unikernel.pid in
|
let pid = vm.Unikernel.pid in
|
||||||
|
@ -122,6 +148,7 @@ let handle_create t reply name vm_config =
|
||||||
Logs.debug (fun m -> m "exec()ed vm") ;
|
Logs.debug (fun m -> m "exec()ed vm") ;
|
||||||
Vmm_resources.insert_vm t.resources name vm >>= fun resources ->
|
Vmm_resources.insert_vm t.resources name vm >>= fun resources ->
|
||||||
let t = { t with resources } in
|
let t = { t with resources } in
|
||||||
|
dump_unikernels t ;
|
||||||
let t, out = log t name (`Unikernel_start (name, vm.Unikernel.pid, vm.Unikernel.taps, None)) in
|
let t, out = log t name (`Unikernel_start (name, vm.Unikernel.pid, vm.Unikernel.taps, None)) in
|
||||||
let t, stat_out = setup_stats t name vm in
|
let t, stat_out = setup_stats t name vm in
|
||||||
Ok (t, stat_out :: out :: reply, name, vm)))
|
Ok (t, stat_out :: out :: reply, name, vm)))
|
||||||
|
@ -137,6 +164,7 @@ let handle_shutdown t name vm r =
|
||||||
| Ok resources -> resources
|
| Ok resources -> resources
|
||||||
in
|
in
|
||||||
let t = { t with resources } in
|
let t = { t with resources } in
|
||||||
|
if not !in_shutdown then dump_unikernels t ;
|
||||||
let t, logout = log t name (`Unikernel_stop (name, vm.Unikernel.pid, r)) in
|
let t, logout = log t name (`Unikernel_stop (name, vm.Unikernel.pid, r)) in
|
||||||
let t, stat_out = remove_stats t name in
|
let t, stat_out = remove_stats t name in
|
||||||
(t, [ stat_out ; logout ])
|
(t, [ stat_out ; logout ])
|
||||||
|
|
|
@ -24,6 +24,10 @@ type 'a create =
|
||||||
val handle_shutdown : 'a t -> Name.t -> Unikernel.t ->
|
val handle_shutdown : 'a t -> Name.t -> Unikernel.t ->
|
||||||
[ `Exit of int | `Signal of int | `Stop of int ] -> 'a t * out list
|
[ `Exit of int | `Signal of int | `Stop of int ] -> 'a t * out list
|
||||||
|
|
||||||
|
val handle_create : 'a t -> out list ->
|
||||||
|
Name.t -> Unikernel.config ->
|
||||||
|
('a t * out list * [ `Create of 'a create ], [> `Msg of string ]) result
|
||||||
|
|
||||||
val handle_command : 'a t -> Vmm_commands.wire ->
|
val handle_command : 'a t -> Vmm_commands.wire ->
|
||||||
'a t * out list *
|
'a t * out list *
|
||||||
[ `Create of 'a create
|
[ `Create of 'a create
|
||||||
|
@ -33,3 +37,7 @@ val handle_command : 'a t -> Vmm_commands.wire ->
|
||||||
| `Wait_and_create of Name.t * ('a t -> 'a t * out list * [ `Create of 'a create | `End ]) ]
|
| `Wait_and_create of Name.t * ('a t -> 'a t * out list * [ `Create of 'a create | `End ]) ]
|
||||||
|
|
||||||
val killall : 'a t -> bool
|
val killall : 'a t -> bool
|
||||||
|
|
||||||
|
val restore_unikernels : unit -> (Unikernel.config Vmm_trie.t, [> `Msg of string ]) result
|
||||||
|
|
||||||
|
val dump_unikernels : 'a t -> unit
|
||||||
|
|
Loading…
Reference in a new issue