balsoft/ligo
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Shell/RPC: use GET request for /workers

Browse Source
This commit is contained in:
Grégoire Henry 2018-04-21 15:28:10 +02:00 committed by Benjamin Canou
parent 64c464a73f
commit 0a78bbe33b
5 changed files with 37 additions and 55 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/lib_shell/node.ml
View File

@ -144,7 +144,7 @@ let build_rpc_directory node =
merge (Injection_directory.build_rpc_directory node.validator) ; merge (Injection_directory.build_rpc_directory node.validator) ;
merge (Chain_directory.build_rpc_directory node.validator) ; merge (Chain_directory.build_rpc_directory node.validator) ;
merge (P2p.build_rpc_directory node.p2p) ; merge (P2p.build_rpc_directory node.p2p) ;
merge Worker_directory.rpc_directory ; merge (Worker_directory.build_rpc_directory node.state) ;
register0 RPC_service.error_service begin fun () () -> register0 RPC_service.error_service begin fun () () ->
return (Data_encoding.Json.schema Error_monad.error_encoding) return (Data_encoding.Json.schema Error_monad.error_encoding)

14
src/lib_shell/worker_directory.ml
View File

@ -7,7 +7,7 @@
(* *) (* *)
(**************************************************************************) (**************************************************************************)
let rpc_directory = let build_rpc_directory state =
let dir : unit RPC_directory.t ref = ref RPC_directory.empty in let dir : unit RPC_directory.t ref = ref RPC_directory.empty in
let register0 s f = let register0 s f =
@ -26,7 +26,8 @@ let rpc_directory =
(Prevalidator.running_workers ())) (Prevalidator.running_workers ()))
end ; end ;
register1 Worker_services.Prevalidators.S.state begin fun chain_id () () -> register1 Worker_services.Prevalidators.S.state begin fun chain () () ->
Chain_directory.get_chain_id state chain >>= fun chain_id ->
let w = List.assoc chain_id (Prevalidator.running_workers ()) in let w = List.assoc chain_id (Prevalidator.running_workers ()) in
return return
{ Worker_types.status = Prevalidator.status w ; { Worker_types.status = Prevalidator.status w ;
@ -48,7 +49,8 @@ let rpc_directory =
(* Workers : Peer validators *) (* Workers : Peer validators *)
register1 Worker_services.Peer_validators.S.list begin fun chain_id () () -> register1 Worker_services.Peer_validators.S.list begin fun chain () () ->
Chain_directory.get_chain_id state chain >>= fun chain_id ->
return return
(List.filter_map (List.filter_map
(fun ((id, peer_id), w) -> (fun ((id, peer_id), w) ->
@ -58,7 +60,8 @@ let rpc_directory =
(Peer_validator.running_workers ())) (Peer_validator.running_workers ()))
end ; end ;
register2 Worker_services.Peer_validators.S.state begin fun chain_id peer_id () () -> register2 Worker_services.Peer_validators.S.state begin fun chain peer_id () () ->
Chain_directory.get_chain_id state chain >>= fun chain_id ->
let w = List.assoc (chain_id, peer_id) (Peer_validator.running_workers ()) in let w = List.assoc (chain_id, peer_id) (Peer_validator.running_workers ()) in
return return
{ Worker_types.status = Peer_validator.status w ; { Worker_types.status = Peer_validator.status w ;
@ -76,7 +79,8 @@ let rpc_directory =
(Chain_validator.running_workers ())) (Chain_validator.running_workers ()))
end ; end ;
register1 Worker_services.Chain_validators.S.state begin fun chain_id () () -> register1 Worker_services.Chain_validators.S.state begin fun chain () () ->
Chain_directory.get_chain_id state chain >>= fun chain_id ->
let w = List.assoc chain_id (Chain_validator.running_workers ()) in let w = List.assoc chain_id (Chain_validator.running_workers ()) in
return return
{ Worker_types.status = Chain_validator.status w ; { Worker_types.status = Chain_validator.status w ;

2
src/lib_shell/worker_directory.mli
View File

@ -7,4 +7,4 @@
(* *) (* *)
(**************************************************************************) (**************************************************************************)
val rpc_directory: unit RPC_directory.t val build_rpc_directory: State.t -> unit RPC_directory.t

44
src/lib_shell_services/worker_services.ml
View File

@ -14,10 +14,9 @@ module Prevalidators = struct
module S = struct module S = struct
let list = let list =
RPC_service.post_service RPC_service.get_service
~description:"Lists the Prevalidator workers and their status." ~description:"Lists the Prevalidator workers and their status."
~query: RPC_query.empty ~query: RPC_query.empty
~input: empty
~output: ~output:
(list (list
(obj2 (obj2
@ -26,17 +25,15 @@ module Prevalidators = struct
RPC_path.(root / "workers" / "prevalidators") RPC_path.(root / "workers" / "prevalidators")
let state = let state =
let open Data_encoding in RPC_service.get_service
RPC_service.post_service
~description:"Introspect the state of a prevalidator worker." ~description:"Introspect the state of a prevalidator worker."
~query: RPC_query.empty ~query: RPC_query.empty
~input: empty
~output: ~output:
(Worker_types.full_status_encoding (Worker_types.full_status_encoding
Prevalidator_worker_state.Request.encoding Prevalidator_worker_state.Request.encoding
Prevalidator_worker_state.Event.encoding Prevalidator_worker_state.Event.encoding
RPC_error.encoding) RPC_error.encoding)
RPC_path.(root / "workers" / "prevalidators" /: Chain_id.rpc_arg ) RPC_path.(root / "workers" / "prevalidators" /: Chain_services.chain_arg )
end end
@ -51,11 +48,9 @@ module Block_validator = struct
module S = struct module S = struct
let state = let state =
let open Data_encoding in RPC_service.get_service
RPC_service.post_service
~description:"Introspect the state of the block_validator worker." ~description:"Introspect the state of the block_validator worker."
~query: RPC_query.empty ~query: RPC_query.empty
~input: empty
~output: ~output:
(Worker_types.full_status_encoding (Worker_types.full_status_encoding
Block_validator_worker_state.Request.encoding Block_validator_worker_state.Request.encoding
@ -74,12 +69,6 @@ module Peer_validators = struct
module S = struct module S = struct
let (chain_id_arg : Chain_id.t RPC_arg.t) =
RPC_arg.like
Chain_id.rpc_arg
~descr:"The chain identifier the peer validator is associated to."
"chain_id"
let (peer_id_arg : P2p_peer.Id.t RPC_arg.t) = let (peer_id_arg : P2p_peer.Id.t RPC_arg.t) =
RPC_arg.make RPC_arg.make
~name:"peer_id" ~name:"peer_id"
@ -91,29 +80,26 @@ module Peer_validators = struct
() ()
let list = let list =
RPC_service.post_service RPC_service.get_service
~description:"Lists the peer validator workers and their status." ~description:"Lists the peer validator workers and their status."
~query: RPC_query.empty ~query: RPC_query.empty
~input: empty
~output: ~output:
(list (list
(obj2 (obj2
(req "peer_id" P2p_peer.Id.encoding) (req "peer_id" P2p_peer.Id.encoding)
(req "status" (Worker_types.worker_status_encoding RPC_error.encoding)))) (req "status" (Worker_types.worker_status_encoding RPC_error.encoding))))
RPC_path.(root / "workers" / "peer_validators" /: chain_id_arg) RPC_path.(root / "workers" / "peer_validators" /: Chain_services.chain_arg)
let state = let state =
let open Data_encoding in RPC_service.get_service
RPC_service.post_service
~description:"Introspect the state of a peer validator worker." ~description:"Introspect the state of a peer validator worker."
~query: RPC_query.empty ~query: RPC_query.empty
~input: empty
~output: ~output:
(Worker_types.full_status_encoding (Worker_types.full_status_encoding
Peer_validator_worker_state.Request.encoding Peer_validator_worker_state.Request.encoding
Peer_validator_worker_state.Event.encoding Peer_validator_worker_state.Event.encoding
RPC_error.encoding) RPC_error.encoding)
RPC_path.(root / "workers" / "peer_validators" /: chain_id_arg /: peer_id_arg) RPC_path.(root / "workers" / "peer_validators" /: Chain_services.chain_arg /: peer_id_arg)
end end
@ -126,17 +112,11 @@ end
module Chain_validators = struct module Chain_validators = struct
module S = struct module S = struct
let (chain_id_arg : Chain_id.t RPC_arg.t) =
RPC_arg.like
Chain_id.rpc_arg
~descr:"The chain identifier of whom the chain validator is responsible."
"chain_id"
let list = let list =
RPC_service.post_service RPC_service.get_service
~description:"Lists the chain validator workers and their status." ~description:"Lists the chain validator workers and their status."
~query: RPC_query.empty ~query: RPC_query.empty
~input: empty
~output: ~output:
(list (list
(obj2 (obj2
@ -145,17 +125,15 @@ module Chain_validators = struct
RPC_path.(root / "workers" / "chain_validators") RPC_path.(root / "workers" / "chain_validators")
let state = let state =
let open Data_encoding in RPC_service.get_service
RPC_service.post_service
~description:"Introspect the state of a chain validator worker." ~description:"Introspect the state of a chain validator worker."
~query: RPC_query.empty ~query: RPC_query.empty
~input: empty
~output: ~output:
(Worker_types.full_status_encoding (Worker_types.full_status_encoding
Chain_validator_worker_state.Request.encoding Chain_validator_worker_state.Request.encoding
Chain_validator_worker_state.Event.encoding Chain_validator_worker_state.Event.encoding
RPC_error.encoding) RPC_error.encoding)
RPC_path.(root / "workers" / "chain_validators" /: chain_id_arg ) RPC_path.(root / "workers" / "chain_validators" /: Chain_services.chain_arg )
end end

30
src/lib_shell_services/worker_services.mli
View File

@ -16,18 +16,18 @@ module Prevalidators : sig
val list: val list:
#simple -> (Chain_id.t * Worker_types.worker_status) list tzresult Lwt.t #simple -> (Chain_id.t * Worker_types.worker_status) list tzresult Lwt.t
val state: val state:
#simple -> Chain_id.t -> (Request.view, Event.t) Worker_types.full_status tzresult Lwt.t #simple -> Chain_services.chain -> (Request.view, Event.t) Worker_types.full_status tzresult Lwt.t
module S : sig module S : sig
val list : val list :
([ `POST ], unit, ([ `GET ], unit,
unit, unit, unit, unit, unit, unit,
(Chain_id.t * Worker_types.worker_status) list) RPC_service.t (Chain_id.t * Worker_types.worker_status) list) RPC_service.t
val state : val state :
([ `POST ], unit, ([ `GET ], unit,
unit * Chain_id.t, unit, unit, unit * Chain_services.chain, unit, unit,
(Request.view, Event.t) Worker_types.full_status) RPC_service.t (Request.view, Event.t) Worker_types.full_status) RPC_service.t
end end
@ -44,7 +44,7 @@ module Block_validator : sig
module S : sig module S : sig
val state : val state :
([ `POST ], unit, ([ `GET ], unit,
unit, unit, unit, unit, unit, unit,
(Request.view, Event.t) Worker_types.full_status) RPC_service.t (Request.view, Event.t) Worker_types.full_status) RPC_service.t
@ -57,23 +57,23 @@ module Peer_validators : sig
open Peer_validator_worker_state open Peer_validator_worker_state
val list: val list:
#simple -> Chain_id.t -> #simple -> Chain_services.chain ->
(P2p_peer.Id.t * Worker_types.worker_status) list tzresult Lwt.t (P2p_peer.Id.t * Worker_types.worker_status) list tzresult Lwt.t
val state: val state:
#simple -> #simple ->
Chain_id.t -> P2p_peer.Id.t -> (Request.view, Event.t) Worker_types.full_status tzresult Lwt.t Chain_services.chain -> P2p_peer.Id.t -> (Request.view, Event.t) Worker_types.full_status tzresult Lwt.t
module S : sig module S : sig
val list : val list :
([ `POST ], unit, ([ `GET ], unit,
unit * Chain_id.t, unit, unit, unit * Chain_services.chain, unit, unit,
(P2p_peer.Id.t * Worker_types.worker_status) list) RPC_service.t (P2p_peer.Id.t * Worker_types.worker_status) list) RPC_service.t
val state : val state :
([ `POST ], unit, ([ `GET ], unit,
(unit * Chain_id.t) * P2p_peer.Id.t, unit, unit, (unit * Chain_services.chain) * P2p_peer.Id.t, unit, unit,
(Request.view, Event.t) Worker_types.full_status) RPC_service.t (Request.view, Event.t) Worker_types.full_status) RPC_service.t
end end
@ -87,18 +87,18 @@ module Chain_validators : sig
val list: val list:
#simple -> (Chain_id.t * Worker_types.worker_status) list tzresult Lwt.t #simple -> (Chain_id.t * Worker_types.worker_status) list tzresult Lwt.t
val state: val state:
#simple -> Chain_id.t -> (Request.view, Event.t) Worker_types.full_status tzresult Lwt.t #simple -> Chain_services.chain -> (Request.view, Event.t) Worker_types.full_status tzresult Lwt.t
module S : sig module S : sig
val list : val list :
([ `POST ], unit, ([ `GET ], unit,
unit, unit, unit, unit, unit, unit,
(Chain_id.t * Worker_types.worker_status) list) RPC_service.t (Chain_id.t * Worker_types.worker_status) list) RPC_service.t
val state : val state :
([ `POST ], unit, ([ `GET ], unit,
unit * Chain_id.t, unit, unit, unit * Chain_services.chain, unit, unit,
(Request.view, Event.t) Worker_types.full_status) RPC_service.t (Request.view, Event.t) Worker_types.full_status) RPC_service.t
end end