Skip to content

Commit 582f22f

Browse files
hannesmhannesm
committed
the big rename, what used to be "vm" as identifier or log output or error, is now unikernel
fixes #191
1 parent 511da9f commit 582f22f

13 files changed

+302
-299
lines changed

‎client/albatross_client.ml

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -61,11 +61,11 @@ let output_result ((hdr, reply) as wire) =
6161
| `Unikernel_image (compressed, image) ->
6262
let name = hdr.Vmm_commands.name in
6363
write_to_file name compressed image
64-
| `Old_unikernels vms ->
64+
| `Old_unikernels unikernels ->
6565
List.iter (fun (name, cfg) ->
6666
if String.length cfg.Vmm_core.Unikernel.image > 0 then
6767
write_to_file name cfg.compressed cfg.image)
68-
vms
68+
unikernels
6969
| `Block_device_image (compressed, image) ->
7070
let name = hdr.Vmm_commands.name in
7171
write_to_file name compressed image
@@ -175,7 +175,7 @@ let prepare_update ~happy_eyeballs level host dryrun = function
175175
Lwt.return (Error Communication_failed)
176176
| Error _ -> Lwt.return (Error Communication_failed)
177177

178-
let create_vm force image cpuid memory argv block_devices bridges compression restart_on_fail exit_codes =
178+
let create_unikernel force image cpuid memory argv block_devices bridges compression restart_on_fail exit_codes =
179179
let ( let* ) = Result.bind in
180180
let* () =
181181
if Vmm_core.String_set.(cardinal (of_list (List.map (fun (n, _, _) -> n) bridges))) = List.length bridges then
@@ -222,15 +222,15 @@ let create_block size compression data =
222222
else
223223
Error (`Msg "data exceeds size")
224224

225-
let policy vms memory cpus block bridgesl =
225+
let policy unikernels memory cpus block bridgesl =
226226
let bridges = Vmm_core.String_set.of_list bridgesl
227227
and cpuids = Vmm_core.IS.of_list cpus
228228
in
229229
if not (Vmm_core.String_set.cardinal bridges = List.length bridgesl) then
230230
Logs.warn (fun m -> m "Bridges is not a set");
231231
if not (Vmm_core.IS.cardinal cpuids = List.length cpus) then
232232
Logs.warn (fun m -> m "CPUids is not a set");
233-
Vmm_core.Policy.{ vms ; cpuids ; memory ; block ; bridges }
233+
Vmm_core.Policy.{ unikernels ; cpuids ; memory ; block ; bridges }
234234

235235
let to_exit_code = function
236236
| Error `Eof -> Error Success
@@ -668,8 +668,8 @@ let info_policy () path =
668668
let remove_policy () path =
669669
jump (`Policy_cmd `Policy_remove) (Vmm_core.Name.create_of_path path)
670670

671-
let add_policy () vms memory cpus block bridges path d cert key ca key_type tmpdir =
672-
let p = policy vms memory cpus block bridges in
671+
let add_policy () unikernels memory cpus block bridges path d cert key ca key_type tmpdir =
672+
let p = policy unikernels memory cpus block bridges in
673673
match Vmm_core.Policy.usable p with
674674
| Error `Msg msg ->
675675
Logs.err (fun m -> m "%s" msg);
@@ -689,7 +689,7 @@ let destroy () = jump (`Unikernel_cmd `Unikernel_destroy)
689689

690690
let create () force image cpuid memory argv block network compression restart_on_fail exit_code
691691
name d cert key ca key_type tmpdir =
692-
match create_vm force image cpuid memory argv block network (compress_default compression d) restart_on_fail exit_code with
692+
match create_unikernel force image cpuid memory argv block network (compress_default compression d) restart_on_fail exit_code with
693693
| Ok cmd -> jump (`Unikernel_cmd cmd) name d cert key ca key_type tmpdir
694694
| Error _ as e -> e
695695

@@ -972,7 +972,7 @@ let cpus =
972972
let doc = "CPUids to allow for this policy (argument may be repeated)." in
973973
Arg.(value & opt_all int [] & info [ "cpu" ] ~doc)
974974

975-
let vms =
975+
let unikernels =
976976
let doc = "Number of unikernels to allow running at the same time." in
977977
Arg.(required & pos 1 (some int) None & info [] ~doc ~docv:"UNIKERNELS")
978978

@@ -1016,7 +1016,7 @@ let cpu =
10161016
let doc = "CPUid to use." in
10171017
Arg.(value & opt int 0 & info [ "cpu" ] ~doc)
10181018

1019-
let vm_mem =
1019+
let unikernel_mem =
10201020
let doc = "Memory to assign (in MB)." in
10211021
Arg.(value & opt int 32 & info [ "mem" ] ~doc)
10221022

@@ -1127,23 +1127,23 @@ let path =
11271127
let doc = "Path to unikernels." in
11281128
Arg.(required & pos 0 (some path_c) None & info [] ~doc ~docv:"PATH")
11291129

1130-
let vm_c = Arg.conv (Name.of_string, Name.pp)
1130+
let unikernel_c = Arg.conv (Name.of_string, Name.pp)
11311131

1132-
let opt_vm_name =
1132+
let opt_unikernel_name =
11331133
let doc = "Name of unikernel." in
1134-
Arg.(value & opt vm_c Name.root & info [ "n" ; "name"] ~doc)
1134+
Arg.(value & opt unikernel_c Name.root & info [ "n" ; "name"] ~doc)
11351135

1136-
let vm_name =
1136+
let unikernel_name =
11371137
let doc = "Name of unikernel." in
1138-
Arg.(required & pos 0 (some vm_c) None & info [] ~doc ~docv:"UNIKERNEL-NAME")
1138+
Arg.(required & pos 0 (some unikernel_c) None & info [] ~doc ~docv:"UNIKERNEL-NAME")
11391139

11401140
let block_name =
11411141
let doc = "Name of block device." in
1142-
Arg.(required & pos 0 (some vm_c) None & info [] ~doc ~docv:"BLOCK-NAME")
1142+
Arg.(required & pos 0 (some unikernel_c) None & info [] ~doc ~docv:"BLOCK-NAME")
11431143

11441144
let opt_block_name =
11451145
let doc = "Name of block device." in
1146-
Arg.(value & opt vm_c Name.root & info [ "name" ] ~doc)
1146+
Arg.(value & opt unikernel_c Name.root & info [ "name" ] ~doc)
11471147

11481148
let remote_host default_port =
11491149
let parse s =
@@ -1225,7 +1225,7 @@ let destroy_cmd =
12251225
`P "Destroy a unikernel."]
12261226
in
12271227
let term =
1228-
Term.(term_result (const destroy $ (Albatross_cli.setup_log (const false)) $ vm_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
1228+
Term.(term_result (const destroy $ (Albatross_cli.setup_log (const false)) $ unikernel_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
12291229
and info = Cmd.info "destroy" ~doc ~man ~exits
12301230
in
12311231
Cmd.v info term
@@ -1237,7 +1237,7 @@ let restart_cmd =
12371237
`P "Restarts a unikernel."]
12381238
in
12391239
let term =
1240-
Term.(term_result (const restart $ (Albatross_cli.setup_log (const false)) $ vm_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
1240+
Term.(term_result (const restart $ (Albatross_cli.setup_log (const false)) $ unikernel_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
12411241
and info = Cmd.info "restart" ~doc ~man ~exits
12421242
in
12431243
Cmd.v info term
@@ -1261,7 +1261,7 @@ let info_cmd =
12611261
`P "Shows information about unikernels."]
12621262
in
12631263
let term =
1264-
Term.(term_result (const info_ $ (Albatross_cli.setup_log (const false)) $ opt_vm_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
1264+
Term.(term_result (const info_ $ (Albatross_cli.setup_log (const false)) $ opt_unikernel_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
12651265
and info = Cmd.info "info" ~doc ~man ~exits
12661266
in
12671267
Cmd.v info term
@@ -1273,7 +1273,7 @@ let get_cmd =
12731273
`P "Downloads a unikernel image from albatross to disk."]
12741274
in
12751275
let term =
1276-
Term.(term_result (const get $ (Albatross_cli.setup_log (const false)) $ compress_level $ vm_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
1276+
Term.(term_result (const get $ (Albatross_cli.setup_log (const false)) $ compress_level $ unikernel_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
12771277
and info = Cmd.info "get" ~doc ~man ~exits
12781278
in
12791279
Cmd.v info term
@@ -1297,7 +1297,7 @@ let add_policy_cmd =
12971297
`P "Adds a policy."]
12981298
in
12991299
let term =
1300-
Term.(term_result (const add_policy $ (Albatross_cli.setup_log (const false)) $ vms $ mem $ cpus $ opt_block_size $ bridge $ path $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
1300+
Term.(term_result (const add_policy $ (Albatross_cli.setup_log (const false)) $ unikernels $ mem $ cpus $ opt_block_size $ bridge $ path $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
13011301
and info = Cmd.info "add-policy" ~doc ~man ~exits
13021302
in
13031303
Cmd.v info term
@@ -1309,7 +1309,7 @@ let create_cmd =
13091309
`P "Creates a unikernel."]
13101310
in
13111311
let term =
1312-
Term.(term_result (const create $ (Albatross_cli.setup_log (const false)) $ force $ image $ cpu $ vm_mem $ args $ block $ net $ compress_level $ restart_on_fail $ exit_code $ vm_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
1312+
Term.(term_result (const create $ (Albatross_cli.setup_log (const false)) $ force $ image $ cpu $ unikernel_mem $ args $ block $ net $ compress_level $ restart_on_fail $ exit_code $ unikernel_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
13131313
and info = Cmd.info "create" ~doc ~man ~exits
13141314
in
13151315
Cmd.v info term
@@ -1321,7 +1321,7 @@ let console_cmd =
13211321
`P "Shows console output of a unikernel."]
13221322
in
13231323
let term =
1324-
Term.(term_result (const console $ (Albatross_cli.setup_log (const false)) $ since $ count $ vm_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
1324+
Term.(term_result (const console $ (Albatross_cli.setup_log (const false)) $ since $ count $ unikernel_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
13251325
and info = Cmd.info "console" ~doc ~man ~exits
13261326
in
13271327
Cmd.v info term
@@ -1333,7 +1333,7 @@ let stats_subscribe_cmd =
13331333
`P "Shows statistics of unikernel."]
13341334
in
13351335
let term =
1336-
Term.(term_result (const stats_subscribe $ (Albatross_cli.setup_log (const false)) $ opt_vm_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
1336+
Term.(term_result (const stats_subscribe $ (Albatross_cli.setup_log (const false)) $ opt_unikernel_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
13371337
and info = Cmd.info "stats" ~doc ~man ~exits
13381338
in
13391339
Cmd.v info term
@@ -1345,7 +1345,7 @@ let stats_remove_cmd =
13451345
`P "Removes statistics of unikernel."]
13461346
in
13471347
let term =
1348-
Term.(term_result (const stats_remove $ (Albatross_cli.setup_log (const false)) $ opt_vm_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
1348+
Term.(term_result (const stats_remove $ (Albatross_cli.setup_log (const false)) $ opt_unikernel_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
13491349
and info = Cmd.info "stats-remove" ~doc ~man ~exits
13501350
in
13511351
Cmd.v info term
@@ -1357,7 +1357,7 @@ let stats_add_cmd =
13571357
`P "Add unikernel to statistics gathering."]
13581358
in
13591359
let term =
1360-
Term.(term_result (const stats_add $ (Albatross_cli.setup_log (const false)) $ vmm_dev $ pid_req0 $ bridge_taps $ opt_vm_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
1360+
Term.(term_result (const stats_add $ (Albatross_cli.setup_log (const false)) $ vmm_dev $ pid_req0 $ bridge_taps $ opt_unikernel_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir))
13611361
and info = Cmd.info "stats-add" ~doc ~man ~exits
13621362
in
13631363
Cmd.v info term
@@ -1429,7 +1429,7 @@ let update_cmd =
14291429
`P "Check and update a unikernel from the binary repository."]
14301430
in
14311431
let term =
1432-
Term.(const update $ (Albatross_cli.setup_log (const false)) $ http_host $ dryrun $ compress_level $ vm_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir)
1432+
Term.(const update $ (Albatross_cli.setup_log (const false)) $ http_host $ dryrun $ compress_level $ unikernel_name $ dst $ ca_cert $ ca_key $ server_ca $ pub_key_type $ Albatross_cli.tmpdir)
14331433
and info = Cmd.info "update" ~doc ~man ~exits
14341434
in
14351435
Cmd.v info term

‎daemon/albatross_influx.ml

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -75,7 +75,7 @@ module P = struct
7575

7676
let i64 i = Printf.sprintf "%Lui" i
7777

78-
let encode_ru vm ru =
78+
let encode_ru unikernel ru =
7979
let fields =
8080
[ "utime", tv ru.utime ;
8181
"stime", tv ru.stime ;
@@ -96,9 +96,9 @@ module P = struct
9696
]
9797
in
9898
let fields = List.map (fun (k, v) -> k ^ "=" ^ v) fields in
99-
Printf.sprintf "resource_usage,vm=%s %s" vm (String.concat "," fields)
99+
Printf.sprintf "resource_usage,vm=%s %s" unikernel (String.concat "," fields)
100100

101-
let encode_kinfo_mem vm mem =
101+
let encode_kinfo_mem unikernel mem =
102102
let now = Unix.gettimeofday () in
103103
let started =
104104
Int64.to_float (fst mem.start) +. (float_of_int (snd mem.start) /. 1_000_000.)
@@ -117,9 +117,9 @@ module P = struct
117117
]
118118
in
119119
let fields = List.map (fun (k, v) -> k ^ "=" ^ v) fields in
120-
Printf.sprintf "kinfo_mem,vm=%s %s" vm (String.concat "," fields)
120+
Printf.sprintf "kinfo_mem,vm=%s %s" unikernel (String.concat "," fields)
121121

122-
let encode_vmm vm xs =
122+
let encode_vmm unikernel xs =
123123
let escape s =
124124
let cutted = String.split_on_char ',' s in
125125
let cutted = String.concat "\\," cutted in
@@ -128,13 +128,13 @@ module P = struct
128128
let cutted = String.split_on_char '=' cutted in
129129
String.concat "\\=" cutted
130130
in
131-
Printf.sprintf "vmm,vm=%s %s" vm
131+
Printf.sprintf "vmm,vm=%s %s" unikernel
132132
(String.concat ","
133133
(List.map (fun (k, v) -> (escape k) ^ "=" ^ (i64 v)) xs))
134134

135135
let i32 i = Printf.sprintf "%lui" i
136136

137-
let encode_if vm ifd =
137+
let encode_if unikernel ifd =
138138
let fields =
139139
(* TODO: flags *)
140140
[ "send_queue_length", i32 ifd.send_length ;
@@ -157,7 +157,7 @@ module P = struct
157157
in
158158
let fields = List.map (fun (k, v) -> k ^ "=" ^ v) fields in
159159
Printf.sprintf "interface,vm=%s,bridge=%s %s"
160-
vm ifd.bridge (String.concat "," fields)
160+
unikernel ifd.bridge (String.concat "," fields)
161161
end
162162

163163
let command = ref 1L
@@ -233,10 +233,10 @@ let rec read_sock_write_tcp drop c ?fd fam addr =
233233
Lwt.return (Some fd) >>= fun fd ->
234234
read_sock_write_tcp drop c ?fd fam addr
235235

236-
let query_sock vm c =
237-
let header = Vmm_commands.header ~sequence:!command vm in
236+
let query_sock unikernel c =
237+
let header = Vmm_commands.header ~sequence:!command unikernel in
238238
command := Int64.succ !command ;
239-
Logs.debug (fun m -> m "%Lu requesting %a via socket" !command Name.pp vm) ;
239+
Logs.debug (fun m -> m "%Lu requesting %a via socket" !command Name.pp unikernel) ;
240240
Vmm_lwt.write_wire c (header, `Command (`Stats_cmd `Stats_subscribe))
241241

242242
let rec maybe_connect () =
@@ -251,7 +251,7 @@ let rec maybe_connect () =
251251
Logs.debug (fun m -> m "connected");
252252
Lwt.return c
253253

254-
let client influx vm drop =
254+
let client influx unikernel drop =
255255
match influx with
256256
| None -> Lwt.return (Error (`Msg "influx host not provided"))
257257
| Some (ip, port) ->
@@ -276,7 +276,7 @@ let client influx vm drop =
276276
let rec loop () =
277277
(* start a socket connection to vmm_stats *)
278278
maybe_connect () >>= fun c ->
279-
query_sock vm c >>= function
279+
query_sock unikernel c >>= function
280280
| Error e ->
281281
let err =
282282
Error (`Msg (Fmt.str "error %s while writing to stat socket" (str_of_e e)))
@@ -288,22 +288,22 @@ let client influx vm drop =
288288
in
289289
loop ()
290290

291-
let run_client _ influx vm drop tmpdir =
291+
let run_client _ influx unikernel drop tmpdir =
292292
Sys.(set_signal sigpipe Signal_ignore) ;
293293
Albatross_cli.set_tmpdir tmpdir;
294-
Lwt_main.run (client influx vm drop)
294+
Lwt_main.run (client influx unikernel drop)
295295

296296
open Cmdliner
297297

298298
let drop_label =
299299
let doc = "Drop unikernel path" in
300300
Arg.(value & flag & info [ "drop-label" ] ~doc)
301301

302-
let vm_c = Arg.conv (Name.of_string, Name.pp)
302+
let unikernel_c = Arg.conv (Name.of_string, Name.pp)
303303

304-
let opt_vm_name =
304+
let opt_unikernel_name =
305305
let doc = "name of unikernel." in
306-
Arg.(value & opt vm_c Name.root & info [ "n" ; "name"] ~doc)
306+
Arg.(value & opt unikernel_c Name.root & info [ "n" ; "name"] ~doc)
307307

308308
let cmd =
309309
let doc = "Albatross Influx connector" in
@@ -313,7 +313,7 @@ let cmd =
313313
statistics and pushes them via TCP to influxdb";
314314
] in
315315
let term =
316-
Term.(term_result (const run_client $ (Albatross_cli.setup_log Albatrossd_utils.syslog) $ Albatrossd_utils.influx $ opt_vm_name $ drop_label $ Albatross_cli.tmpdir))
316+
Term.(term_result (const run_client $ (Albatross_cli.setup_log Albatrossd_utils.syslog) $ Albatrossd_utils.influx $ opt_unikernel_name $ drop_label $ Albatross_cli.tmpdir))
317317
and info = Cmd.info "albatross-influx" ~version:Albatross_cli.version ~doc ~man
318318
in
319319
Cmd.v info term

‎daemon/albatrossd.ml

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ let rec create stat_out cons_out data_out name config =
2828
| Error (`Msg msg) ->
2929
Logs.err (fun m -> m "create (exec) failed %s" msg) ;
3030
Lwt.return (None, fail_cont ())
31-
| Ok (state', stat, data, name, vm) ->
31+
| Ok (state', stat, data, name, unikernel) ->
3232
state := state';
3333
(if Unikernel.restart_handler config then
3434
match Vmm_vmmd.register_restart !state name Lwt.task with
@@ -42,18 +42,18 @@ let rec create stat_out cons_out data_out name config =
4242
state := state';
4343
if may && should_restart config name r then
4444
create stat_out cons_out stub_data_out
45-
name vm.Unikernel.config
45+
name unikernel.Unikernel.config
4646
else
4747
Lwt.return_unit)));
4848
stat_out "setting up stat" stat >|= fun () ->
49-
(Some vm, data)) >>= fun (started, data) ->
49+
(Some unikernel, data)) >>= fun (started, data) ->
5050
(match started with
5151
| None -> ()
52-
| Some vm ->
52+
| Some unikernel ->
5353
Lwt.async (fun () ->
54-
Vmm_lwt.wait_and_clear vm.Unikernel.pid >>= fun r ->
54+
Vmm_lwt.wait_and_clear unikernel.Unikernel.pid >>= fun r ->
5555
Lwt_mutex.with_lock create_lock (fun () ->
56-
let state', stat' = Vmm_vmmd.handle_shutdown !state name vm r in
56+
let state', stat' = Vmm_vmmd.handle_shutdown !state name unikernel r in
5757
state := state';
5858
stat_out "handle shutdown stat" stat' >|= fun () ->
5959
let state', waiter_opt = Vmm_vmmd.waiter !state name in
@@ -94,8 +94,8 @@ let handle cons_out stat_out fd addr =
9494
Lwt_mutex.unlock create_lock;
9595
out wire >|= fun () ->
9696
`Close
97-
| `Create (id, vm) ->
98-
create stat_out cons_out out id vm >|= fun () ->
97+
| `Create (id, unikernel) ->
98+
create stat_out cons_out out id unikernel >|= fun () ->
9999
Lwt_mutex.unlock create_lock;
100100
`Close
101101
| `Wait (who, data) ->
@@ -105,14 +105,14 @@ let handle cons_out stat_out fd addr =
105105
task >>= fun r ->
106106
out (data r) >|= fun () ->
107107
`Close
108-
| `Wait_and_create (who, (id, vm)) ->
108+
| `Wait_and_create (who, (id, unikernel)) ->
109109
let state', task = Vmm_vmmd.register !state who Lwt.task in
110110
state := state';
111111
Lwt_mutex.unlock create_lock;
112112
task >>= fun r ->
113113
Logs.info (fun m -> m "wait returned %a" pp_process_exit r);
114114
Lwt_mutex.with_lock create_lock (fun () ->
115-
create stat_out cons_out out id vm) >|= fun () ->
115+
create stat_out cons_out out id unikernel) >|= fun () ->
116116
`Close
117117
| `Replace_stats (wire, datas) ->
118118
(Option.fold

0 commit comments

Comments
 (0)