Skip to content

Commit 3dee731

Browse files
committed
fixup! Handle EIO deadlock when H2 returned an error like 404.
1 parent 35bdad8 commit 3dee731

File tree

3 files changed

+9
-9
lines changed

3 files changed

+9
-9
lines changed

examples/greeter-client-eio/greeter_client_eio.ml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -40,7 +40,7 @@ let main env =
4040

4141
let result =
4242
Grpc_eio.Client.call ~service:"mypackage.Greeter" ~rpc:"SayHello"
43-
~do_request:(H2_eio.Client.request connection ~error_handler:ignore)
43+
~do_request:(H2_eio.Client.request connection)
4444
~handler:(Grpc_eio.Client.Rpc.unary encoded_request ~f)
4545
()
4646
in

examples/routeguide-tutorial.md

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -440,7 +440,7 @@ let call_get_feature connection point =
440440
let encode, decode = Service.make_client_functions RouteGuide.getFeature in
441441
let response =
442442
Client.call ~service:"routeguide.RouteGuide" ~rpc:"GetFeature"
443-
~do_request:(H2_eio.Client.request connection ~error_handler:ignore)
443+
~do_request:(H2_eio.Client.request connection)
444444
~handler:
445445
(Client.Rpc.unary
446446
(encode point |> Writer.contents)
@@ -477,7 +477,7 @@ let print_features connection =
477477
let encode, decode = Service.make_client_functions RouteGuide.listFeatures in
478478
let stream =
479479
Client.call ~service:"routeguide.RouteGuide" ~rpc:"ListFeatures"
480-
~do_request:(H2_eio.Client.request connection ~error_handler:ignore)
480+
~do_request:(H2_eio.Client.request connection)
481481
~handler:
482482
(Client.Rpc.server_streaming
483483
(encode rectangle |> Writer.contents)
@@ -529,7 +529,7 @@ let run_record_route connection =
529529
let encode, decode = Service.make_client_functions RouteGuide.recordRoute in
530530
let response =
531531
Client.call ~service:"routeguide.RouteGuide" ~rpc:"RecordRoute"
532-
~do_request:(H2_eio.Client.request connection ~error_handler:ignore)
532+
~do_request:(H2_eio.Client.request connection)
533533
~handler:
534534
(Client.Rpc.client_streaming ~f:(fun f response ->
535535
(* Stream points to server. *)
@@ -616,7 +616,7 @@ We start by generating a short sequence of locations, similar to how we did for
616616
in
617617
let result =
618618
Client.call ~service:"routeguide.RouteGuide" ~rpc:"RouteChat"
619-
~do_request:(H2_eio.Client.request connection ~error_handler:ignore)
619+
~do_request:(H2_eio.Client.request connection)
620620
~handler:
621621
(Client.Rpc.bidirectional_streaming ~f:(fun writer reader ->
622622
go writer reader route_notes))

examples/routeguide/src/client.ml

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,7 @@ let call_get_feature connection point =
2323
let encode, decode = Service.make_client_functions RouteGuide.getFeature in
2424
let response =
2525
Client.call ~service:"routeguide.RouteGuide" ~rpc:"GetFeature"
26-
~do_request:(H2_eio.Client.request connection ~error_handler:ignore)
26+
~do_request:(H2_eio.Client.request connection)
2727
~handler:
2828
(Client.Rpc.unary
2929
(encode point |> Writer.contents)
@@ -56,7 +56,7 @@ let print_features connection =
5656
let encode, decode = Service.make_client_functions RouteGuide.listFeatures in
5757
let stream =
5858
Client.call ~service:"routeguide.RouteGuide" ~rpc:"ListFeatures"
59-
~do_request:(H2_eio.Client.request connection ~error_handler:ignore)
59+
~do_request:(H2_eio.Client.request connection)
6060
~handler:
6161
(Client.Rpc.server_streaming
6262
(encode rectangle |> Writer.contents)
@@ -101,7 +101,7 @@ let run_record_route connection =
101101
let encode, decode = Service.make_client_functions RouteGuide.recordRoute in
102102
let response =
103103
Client.call ~service:"routeguide.RouteGuide" ~rpc:"RecordRoute"
104-
~do_request:(H2_eio.Client.request connection ~error_handler:ignore)
104+
~do_request:(H2_eio.Client.request connection)
105105
~handler:
106106
(Client.Rpc.client_streaming ~f:(fun f response ->
107107
(* Stream points to server. *)
@@ -179,7 +179,7 @@ let run_route_chat clock connection =
179179
in
180180
let result =
181181
Client.call ~service:"routeguide.RouteGuide" ~rpc:"RouteChat"
182-
~do_request:(H2_eio.Client.request connection ~error_handler:ignore)
182+
~do_request:(H2_eio.Client.request connection)
183183
~handler:
184184
(Client.Rpc.bidirectional_streaming ~f:(fun writer reader ->
185185
go writer reader route_notes))

0 commit comments

Comments
 (0)