client/grpc: fix stream closed bug (#2009)

* client/grpc: fix stream closed bug

* client/grpc: don't use dial context for the stream
This commit is contained in:
ben-toogood
2020-09-17 14:08:21 +01:00
committed by GitHub
parent 3c7f663e8b
commit 19a54f2970
3 changed files with 23 additions and 24 deletions

View File

@@ -17,11 +17,11 @@ type grpcStream struct {
sync.RWMutex
closed bool
err error
conn *grpc.ClientConn
conn *poolConn
request client.Request
response client.Response
context context.Context
cancel func()
close func(err error)
}
func (g *grpcStream) Context() context.Context {
@@ -86,9 +86,9 @@ func (g *grpcStream) Close() error {
if g.closed {
return nil
}
// cancel the context
g.cancel()
// close the connection
g.closed = true
g.ClientStream.CloseSend()
return g.conn.Close()
g.close(g.err)
return g.ClientStream.CloseSend()
}