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

Ergonomics (#41)

Browse source 
The info subcommands for {unikernel,block,policy} never error

Before, running the commands block, info or policy when no block
devices, unikernels or policies respectively were set up the command
would report an error and give the user a dangerous-looking WARNING
saying the command failed:

    $ albatross-client-local block
    albatross-client-local: [WARNING] host [vm: ]: command failed block: not found

Now instead the commands will report success with a message stating
there are no objects.

Co-authored-by: Hannes Mehnert <hannes@mehnert.org>
This commit is contained in:
Reynir Björnsson 2020-11-14 22:27:55 +01:00 committed by GitHub
parent 1986ca2a1d
commit f954955dd0
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
src/vmm_commands.ml
View file

@ -141,12 +141,17 @@ type success = [
let pp_block ppf (id, size, active) = let pp_block ppf (id, size, active) =
Fmt.pf ppf "block %a size %d MB active %B" Name.pp id size active Fmt.pf ppf "block %a size %d MB active %B" Name.pp id size active
let my_fmt_list empty pp_elt ppf xs =
match xs with
| [] -> Fmt.string ppf empty
| _ -> Fmt.(list ~sep:(unit "@.") pp_elt ppf xs)
let pp_success ppf = function let pp_success ppf = function
| `Empty -> Fmt.string ppf "success" | `Empty -> Fmt.string ppf "success"
| `String data -> Fmt.pf ppf "success: %s" data | `String data -> Fmt.pf ppf "success: %s" data
| `Policies ps -> Fmt.(list ~sep:(unit "@.") (pair ~sep:(unit ": ") Name.pp Policy.pp)) ppf ps | `Policies ps -> my_fmt_list "no policies" Fmt.(pair ~sep:(unit ": ") Name.pp Policy.pp) ppf ps
| `Unikernels vms -> Fmt.(list ~sep:(unit "@.") (pair ~sep:(unit ": ") Name.pp Unikernel.pp_config)) ppf vms | `Unikernels vms -> my_fmt_list "no unikernels" Fmt.(pair ~sep:(unit ": ") Name.pp Unikernel.pp_config) ppf vms
| `Block_devices blocks -> Fmt.(list ~sep:(unit "@.") pp_block) ppf blocks | `Block_devices blocks -> my_fmt_list "no block devices" pp_block ppf blocks
type res = [ type res = [
| `Command of t | `Command of t

22
src/vmm_vmmd.ml
View file

@ -212,12 +212,7 @@ let handle_policy_cmd t id = function
(fun prefix policy policies-> (prefix, policy) :: policies) (fun prefix policy policies-> (prefix, policy) :: policies)
[] []
in in
match policies with Ok (t, `End (`Success (`Policies policies)))
| [] ->
Logs.debug (fun m -> m "policies: couldn't find %a" Name.pp id) ;
Error (`Msg "policy: not found")
| _ ->
Ok (t, `End (`Success (`Policies policies)))
let handle_unikernel_cmd t id = function let handle_unikernel_cmd t id = function
| `Unikernel_info -> | `Unikernel_info ->
@ -229,13 +224,7 @@ let handle_unikernel_cmd t id = function
(id, cfg) :: vms) (id, cfg) :: vms)
[] []
in in
begin match vms with Ok (t, `End (`Success (`Unikernels vms)))
| [] ->
Logs.debug (fun m -> m "info: couldn't find %a" Name.pp id) ;
Error (`Msg "info: no unikernel found")
| _ ->
Ok (t, `End (`Success (`Unikernels vms)))
end
| `Unikernel_get -> | `Unikernel_get ->
Logs.debug (fun m -> m "get %a" Name.pp id) ; Logs.debug (fun m -> m "get %a" Name.pp id) ;
begin match Vmm_trie.find id t.resources.Vmm_resources.unikernels with begin match Vmm_trie.find id t.resources.Vmm_resources.unikernels with
@ -304,12 +293,7 @@ let handle_block_cmd t id = function
(fun prefix (size, active) blocks -> (prefix, size, active) :: blocks) (fun prefix (size, active) blocks -> (prefix, size, active) :: blocks)
[] []
in in
match blocks with Ok (t, `End (`Success (`Block_devices blocks)))
| [] ->
Logs.debug (fun m -> m "block: couldn't find %a" Name.pp id) ;
Error (`Msg "block: not found")
| _ ->
Ok (t, `End (`Success (`Block_devices blocks)))
let handle_command t (header, payload) = let handle_command t (header, payload) =
let msg_to_err = function let msg_to_err = function