Skip to content

Commit a6c7de1

Browse files
committed
fix(stream): drpc, srpc: detect deadline exceeded error
Signed-off-by: Christian Stewart <christian@aperture.us>
1 parent 8232b7a commit a6c7de1

File tree

3 files changed

+9
-3
lines changed

3 files changed

+9
-3
lines changed

rpc/client-controller.go

+1-3
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,4 @@ func (c *ClientController) Close() error {
9292
}
9393

9494
// _ is a type assertion
95-
var (
96-
_ controller.Controller = ((*ClientController)(nil))
97-
)
95+
var _ controller.Controller = ((*ClientController)(nil))

stream/drpc/client/client.go

+4
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,10 @@ func (c *Client) ExecuteConnection(
9393
c.c.GetTransportId(),
9494
)
9595
if err != nil {
96+
// detect deadline exceeded
97+
if err == context.Canceled && estCtx.Err() != nil && ctx.Err() == nil {
98+
err = context.DeadlineExceeded
99+
}
96100
le.WithError(err).Warn("unable to establish drpc conn")
97101
lastErr = err
98102
continue

stream/srpc/srpc.go

+4
Original file line numberDiff line numberDiff line change
@@ -79,6 +79,10 @@ func NewMultiOpenStreamFunc(
7979
)
8080
estCtxCancel()
8181
if err != nil {
82+
// detect deadline exceeded
83+
if err == context.Canceled && estCtx.Err() != nil && ctx.Err() == nil {
84+
err = context.DeadlineExceeded
85+
}
8286
le.WithError(err).Warn("unable to establish srpc conn")
8387
lastErr = err
8488
continue

0 commit comments

Comments
 (0)