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

Shell/mempool: handle failure to re-instantiate prevalidator

Browse Source 
When the protocol changes, the prevalidator is re-instantiated. In case
this fails, the old-prevalidator still needs to be shutdown.
This commit is contained in:
Raphaël Proust 2018-11-15 09:56:28 +08:00 committed by Benjamin Canou
parent cd25bb4160
commit c02a970a28
1 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
src/lib_shell/chain_validator.ml
View File

@ -301,13 +301,17 @@ let on_request (type a) w spawn_child (req : a Request.t) : a tzresult Lwt.t =
let (limits, chain_db) = Prevalidator.parameters old_prevalidator in
(* TODO inject in the new prevalidator the operation
from the previous one. *)
Prevalidator.create
limits
(module Proto)
chain_db >>=? fun prevalidator ->
nv.prevalidator <- Some prevalidator ;
Prevalidator.shutdown old_prevalidator >>= fun () ->
return_unit
Prevalidator.create limits (module Proto) chain_db >>= function
| Error errs ->
Log.lwt_log_error "@[Failed to reinstantiate prevalidator:@ %a@]"
pp_print_error errs >>= fun () ->
nv.prevalidator <- None ;
Prevalidator.shutdown old_prevalidator >>= fun () ->
return_unit
| Ok prevalidator ->
nv.prevalidator <- Some prevalidator ;
Prevalidator.shutdown old_prevalidator >>= fun () ->
return_unit
end else begin
Prevalidator.flush old_prevalidator block_hash >>=? fun () ->
return_unit