go/go-micro
1
0
Fork 0
mirror of https://github.com/go-micro/go-micro.git synced 2024-11-24 08:02:32 +02:00
Code Issues Releases Activity

ensure we close the grpc stream (#1098)

Browse Source 
* ensure we close the grpc stream

* use g.Close

* use closed bool flag for checking connection close
This commit is contained in:
Asim Aslam 2020-01-09 17:00:14 +00:00 committed by GitHub
parent a90a74c9e2
commit 37d1139a57
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
client/grpc/grpc.go
View File

@ -211,6 +211,7 @@ func (g *grpcClient) stream(ctx context.Context, node *registry.Node, req client
if opts := g.getGrpcCallOptions(); opts != nil {
grpcCallOptions = append(grpcCallOptions, opts...)
}
st, err := cc.NewStream(ctx, desc, methodToGRPC(req.Service(), req.Endpoint()), grpcCallOptions...)
if err != nil {
return nil, errors.InternalServerError("go.micro.client", fmt.Sprintf("Error creating stream: %v", err))

14
client/grpc/stream.go
View File

@ -12,6 +12,7 @@ import (
// Implements the streamer interface
type grpcStream struct {
sync.RWMutex
closed bool
err error
conn *grpc.ClientConn
stream grpc.ClientStream
@ -46,7 +47,7 @@ func (g *grpcStream) Recv(msg interface{}) (err error) {
// #202 - inconsistent gRPC stream behavior
// the only way to tell if the stream is done is when we get a EOF on the Recv
// here we should close the underlying gRPC ClientConn
closeErr := g.conn.Close()
closeErr := g.Close()
if err == io.EOF && closeErr != nil {
err = closeErr
}
@ -72,5 +73,14 @@ func (g *grpcStream) setError(e error) {
// stream should still be able to receive after this function call
// TODO: should the conn be closed in another way?
func (g *grpcStream) Close() error {
return g.stream.CloseSend()
g.Lock()
defer g.Unlock()
if g.closed {
return nil
}
g.closed = true
g.stream.CloseSend()
return g.conn.Close()
}