reynir/albatross
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

vmm_stats: if sysctl rusage fails, remove vm from stats gathering

Browse source
This commit is contained in:
Hannes Mehnert 2019-01-15 00:39:59 +01:00
parent 58bd77bc5f
commit 2f1197aad1
1 changed files with 39 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

70
app/vmm_stats_pure.ml
View file

@ -46,6 +46,23 @@ let rec wrap f arg =
Logs.err (fun m -> m "exception %s" (Printexc.to_string e)) ; Logs.err (fun m -> m "exception %s" (Printexc.to_string e)) ;
None None
let remove_vmid t vmid =
Logs.info (fun m -> m "removing vmid %a" Vmm_core.Name.pp vmid) ;
match Vmm_trie.find vmid t.vmid_pid with
| None -> Logs.warn (fun m -> m "no pid found for %a" Vmm_core.Name.pp vmid) ; t
| Some pid ->
Logs.info (fun m -> m "removing pid %d" pid) ;
(try
match IM.find pid t.pid_nic with
| Ok vmctx, _, _ -> ignore (wrap vmmapi_close vmctx)
| Error _, _, _ -> ()
with
_ -> ()) ;
let pid_nic = IM.remove pid t.pid_nic
and vmid_pid = Vmm_trie.remove vmid t.vmid_pid
in
{ t with pid_nic ; vmid_pid }
let fill_descr ctx = let fill_descr ctx =
match !descr with match !descr with
| [] -> | [] ->
@ -101,32 +118,40 @@ let gather pid vmctx nics =
let tick t = let tick t =
let pid_nic = try_open_vmmapi t.pid_nic in let pid_nic = try_open_vmmapi t.pid_nic in
let t' = { t with pid_nic } in let t' = { t with pid_nic } in
let outs = let outs, to_remove =
List.fold_left (fun out (vmid, pid) -> List.fold_left (fun (out, to_remove) (vmid, pid) ->
let listeners = Vmm_trie.collect vmid t'.name_sockets in let listeners = Vmm_trie.collect vmid t'.name_sockets in
match listeners with match listeners with
| [] -> Logs.info (fun m -> m "nobody is listening") ; out | [] -> Logs.info (fun m -> m "nobody is listening") ; (out, to_remove)
| xs -> match IM.find_opt pid t.pid_nic with | xs -> match IM.find_opt pid t.pid_nic with
| None -> Logs.warn (fun m -> m "couldn't find nics of %d" pid) ; out | None ->
Logs.warn (fun m -> m "couldn't find nics of %d" pid) ;
out, to_remove
| Some (vmctx, _, nics) -> | Some (vmctx, _, nics) ->
let ru, mem, vmm, ifd = gather pid vmctx nics in let ru, mem, vmm, ifd = gather pid vmctx nics in
match ru with match ru with
| None -> Logs.err (fun m -> m "failed to get rusage for %d" pid) ; out | None ->
Logs.err (fun m -> m "failed to get rusage for %d" pid) ;
out, vmid :: to_remove
| Some ru' -> | Some ru' ->
let stats = let stats =
let vmm' = match vmm with None -> None | Some xs -> Some (List.combine !descr xs) in let vmm' = match vmm with None -> None | Some xs -> Some (List.combine !descr xs) in
ru', mem, vmm', ifd ru', mem, vmm', ifd
in in
List.fold_left (fun out (id, socket) -> let outs =
match Vmm_core.Name.drop_super ~super:id ~sub:vmid with List.fold_left (fun out (id, socket) ->
| None -> Logs.err (fun m -> m "couldn't drop super %a from sub %a" Vmm_core.Name.pp id Vmm_core.Name.pp vmid) ; out match Vmm_core.Name.drop_super ~super:id ~sub:vmid with
| Some real_id -> | None -> Logs.err (fun m -> m "couldn't drop super %a from sub %a" Vmm_core.Name.pp id Vmm_core.Name.pp vmid) ; out
let header = Vmm_commands.{ version = my_version ; sequence = 0L ; name = real_id } in | Some real_id ->
((socket, id, (header, `Data (`Stats_data stats))) :: out)) let header = Vmm_commands.{ version = my_version ; sequence = 0L ; name = real_id } in
out xs) ((socket, id, (header, `Data (`Stats_data stats))) :: out))
[] (Vmm_trie.all t'.vmid_pid) out xs
in
outs, to_remove)
([], []) (Vmm_trie.all t'.vmid_pid)
in in
(t', outs) let t'' = List.fold_left remove_vmid t' to_remove in
(t'', outs)
let add_pid t vmid vmmdev pid nics = let add_pid t vmid vmmdev pid nics =
match wrap sysctl_ifcount () with match wrap sysctl_ifcount () with
@ -155,23 +180,6 @@ let add_pid t vmid vmmdev pid nics =
assert (ret = None) ; assert (ret = None) ;
Ok { t with pid_nic ; vmid_pid } Ok { t with pid_nic ; vmid_pid }
let remove_vmid t vmid =
Logs.info (fun m -> m "removing vmid %a" Vmm_core.Name.pp vmid) ;
match Vmm_trie.find vmid t.vmid_pid with
| None -> Logs.warn (fun m -> m "no pid found for %a" Vmm_core.Name.pp vmid) ; t
| Some pid ->
Logs.info (fun m -> m "removing pid %d" pid) ;
(try
match IM.find pid t.pid_nic with
| Ok vmctx, _, _ -> ignore (wrap vmmapi_close vmctx)
| Error _, _, _ -> ()
with
_ -> ()) ;
let pid_nic = IM.remove pid t.pid_nic
and vmid_pid = Vmm_trie.remove vmid t.vmid_pid
in
{ t with pid_nic ; vmid_pid }
let handle t socket (header, wire) = let handle t socket (header, wire) =
if not (Vmm_commands.version_eq my_version header.Vmm_commands.version) then begin if not (Vmm_commands.version_eq my_version header.Vmm_commands.version) then begin
Logs.err (fun m -> m "invalid version %a (mine is %a)" Logs.err (fun m -> m "invalid version %a (mine is %a)"