opensource/grpc-go
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

the cancel function should be called to avoid ctx leak (#1465)

Browse Source
This commit is contained in:
ZhouyihaiDing
2017-08-25 13:10:07 -07:00
committed by dfawley
parent 051e7013db
commit 8336807293
1 changed files with 8 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
balancer_test.go
View File

@ -161,10 +161,11 @@ func TestEmptyAddrs(t *testing.T) {
// Loop until the above updates apply. // Loop until the above updates apply.
for { for {
time.Sleep(10 * time.Millisecond) time.Sleep(10 * time.Millisecond)
ctx, _ := context.WithTimeout(context.Background(), 10*time.Millisecond) ctx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond)
if err := Invoke(ctx, "/foo/bar", &expectedRequest, &reply, cc); err != nil { if err := Invoke(ctx, "/foo/bar", &expectedRequest, &reply, cc); err != nil {
break break
} }
cancel()
} }
cc.Close() cc.Close()
servers[0].stop() servers[0].stop()
@ -236,11 +237,12 @@ func TestCloseWithPendingRPC(t *testing.T) {
r.w.inject(updates) r.w.inject(updates)
// Loop until the above update applies. // Loop until the above update applies.
for { for {
ctx, _ := context.WithTimeout(context.Background(), 10*time.Millisecond) ctx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond)
if err := Invoke(ctx, "/foo/bar", &expectedRequest, &reply, cc, FailFast(false)); Code(err) == codes.DeadlineExceeded { if err := Invoke(ctx, "/foo/bar", &expectedRequest, &reply, cc, FailFast(false)); Code(err) == codes.DeadlineExceeded {
break break
} }
time.Sleep(10 * time.Millisecond) time.Sleep(10 * time.Millisecond)
cancel()
} }
// Issue 2 RPCs which should be completed with error status once cc is closed. // Issue 2 RPCs which should be completed with error status once cc is closed.
var wg sync.WaitGroup var wg sync.WaitGroup
@ -462,10 +464,11 @@ func TestPickFirstEmptyAddrs(t *testing.T) {
// Loop until the above updates apply. // Loop until the above updates apply.
for { for {
time.Sleep(10 * time.Millisecond) time.Sleep(10 * time.Millisecond)
ctx, _ := context.WithTimeout(context.Background(), 10*time.Millisecond) ctx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond)
if err := Invoke(ctx, "/foo/bar", &expectedRequest, &reply, cc); err != nil { if err := Invoke(ctx, "/foo/bar", &expectedRequest, &reply, cc); err != nil {
break break
} }
cancel()
} }
} }
@ -488,11 +491,12 @@ func TestPickFirstCloseWithPendingRPC(t *testing.T) {
r.w.inject(updates) r.w.inject(updates)
// Loop until the above update applies. // Loop until the above update applies.
for { for {
ctx, _ := context.WithTimeout(context.Background(), 10*time.Millisecond) ctx, cancel := context.WithTimeout(context.Background(), 10*time.Millisecond)
if err := Invoke(ctx, "/foo/bar", &expectedRequest, &reply, cc, FailFast(false)); Code(err) == codes.DeadlineExceeded { if err := Invoke(ctx, "/foo/bar", &expectedRequest, &reply, cc, FailFast(false)); Code(err) == codes.DeadlineExceeded {
break break
} }
time.Sleep(10 * time.Millisecond) time.Sleep(10 * time.Millisecond)
cancel()
} }
// Issue 2 RPCs which should be completed with error status once cc is closed. // Issue 2 RPCs which should be completed with error status once cc is closed.
var wg sync.WaitGroup var wg sync.WaitGroup