astelm
/
grpcurl
mirror of https://github.com/fullstorydev/grpcurl.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

fix race condition in bidi tests (#35)

This commit is contained in:
Joshua Humphries 2018-05-29 11:04:40 -04:00 committed by GitHub
parent 75dcbf0d4c
commit 00643a3fb8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
grpcurl.go
View File

@ -386,7 +386,7 @@ func InvokeRpc(ctx context.Context, source DescriptorSource, cc *grpc.ClientConn
defer cancel() defer cancel()
if mtd.IsClientStreaming() && mtd.IsServerStreaming() { if mtd.IsClientStreaming() && mtd.IsServerStreaming() {
return invokeBidi(ctx, cancel, stub, mtd, handler, requestData, req) return invokeBidi(ctx, stub, mtd, handler, requestData, req)
} else if mtd.IsClientStreaming() { } else if mtd.IsClientStreaming() {
return invokeClientStream(ctx, stub, mtd, handler, requestData, req) return invokeClientStream(ctx, stub, mtd, handler, requestData, req)
} else if mtd.IsServerStreaming() { } else if mtd.IsServerStreaming() {
@ -554,13 +554,12 @@ func invokeServerStream(ctx context.Context, stub grpcdynamic.Stub, md *desc.Met
return nil return nil
} }
func invokeBidi(ctx context.Context, cancel context.CancelFunc, stub grpcdynamic.Stub, md *desc.MethodDescriptor, handler InvocationEventHandler, func invokeBidi(ctx context.Context, stub grpcdynamic.Stub, md *desc.MethodDescriptor, handler InvocationEventHandler,
requestData RequestMessageSupplier, req proto.Message) error { requestData RequestMessageSupplier, req proto.Message) error {
// invoke the RPC! // invoke the RPC!
str, err := stub.InvokeRpcBidiStream(ctx, md) str, err := stub.InvokeRpcBidiStream(ctx, md)
// mutex protects access to handler and sendErr since we'll have two goroutines sharing them
var wg sync.WaitGroup var wg sync.WaitGroup
var sendErr atomic.Value var sendErr atomic.Value
@ -600,8 +599,6 @@ func invokeBidi(ctx context.Context, cancel context.CancelFunc, stub grpcdynamic
if err != nil { if err != nil {
sendErr.Store(err) sendErr.Store(err)
// signals error to other goroutine
cancel()
} }
}() }()
} }