Skip to content
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

Jump to bottom

Added --terse option to ocluster-admin-show and added new command ocluster-admin-exec #165

Merged
merged 5 commits into from
Apr 26, 2022
Merged

Added --terse option to ocluster-admin-show and added new command ocluster-admin-exec #165

Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
18b93ac
Added --terse option to ocluster-admin-show
mtelvers Apr 1, 2022
e56baf5
Untidy exec
mtelvers Apr 2, 2022
f061bd4
shorter version
mtelvers Apr 3, 2022
399504b
smaller ignore
mtelvers Apr 3, 2022
09a383e
exec working and tidy
mtelvers Apr 4, 2022
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
22 changes: 17 additions & 5 deletions bin/admin.ml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -37,16 +37,21 @@ let set_rate () cap_path pool_id client_id rate =
let pool = Cluster_api.Admin.pool admin_service pool_id in
Cluster_api.Pool_admin.set_rate pool ~client_id rate

let show () cap_path pool =
let show () cap_path terse pool =
run cap_path @@ fun admin_service ->
match pool with
| None ->
Cluster_api.Admin.pools admin_service >|= fun pools ->
List.iter print_endline pools
| Some pool ->
Capability.with_ref (Cluster_api.Admin.pool admin_service pool) @@ fun pool ->
Cluster_api.Pool_admin.show pool >|= fun status ->
print_endline (String.trim status)
if terse then
Capability.with_ref (Cluster_api.Admin.pool admin_service pool) @@ fun pool ->
Cluster_api.Pool_admin.workers pool >|= fun workers ->
List.iter (fun (w:Cluster_api.Pool_admin.worker_info) -> print_endline w.name) workers
else
Capability.with_ref (Cluster_api.Admin.pool admin_service pool) @@ fun pool ->
mtelvers marked this conversation as resolved.
Show resolved Hide resolved
Cluster_api.Pool_admin.show pool >|= fun status ->
print_endline (String.trim status)

let with_progress label =
Capability.with_ref (Cluster_api.Progress.local (Fmt.pr "%s: %s@." label))
Expand Down Expand Up @@ -238,6 +243,13 @@ let wait =
~doc:"Wait until no jobs are running"
["wait"]

let terse =
Arg.value @@
Arg.flag @@
Arg.info
~doc:"Just list names of the workers"
["terse"]

let add_client =
let doc = "Create a new client endpoint for submitting jobs" in
let info = Cmd.info "add-client" ~doc in
Expand Down Expand Up @@ -266,7 +278,7 @@ let show =
let doc = "Show information about a service, pool or worker" in
let info = Cmd.info "show" ~doc in
Cmd.v info
Term.(const show $ Logging.term $ connect_addr $ Arg.value pool_pos)
Term.(const show $ Logging.term $ connect_addr $ terse $ Arg.value pool_pos)

let pause =
let doc = "Set a worker to be unavailable for further jobs" in
Expand Down