veyron/runtimes/google/ipc: Impelement a better fix for cancellation goroutine leak.
This version prevents spawning many goroutines in the first place by reusing
the contexts cancel channel. Also fix a goroutine leak when a single
context is used to make a large number of calls over a long period of time
on the client side.
Change-Id: I29fdc6b290b4bbad2ea82c0b399c7deee9dff6f9
diff --git a/runtimes/google/ipc/client.go b/runtimes/google/ipc/client.go
index 1a749d0..f4e177b 100644
--- a/runtimes/google/ipc/client.go
+++ b/runtimes/google/ipc/client.go
@@ -219,14 +219,7 @@
vlog.VI(2).Infof("ipc: couldn't connect to server %v: %v", server, err)
continue // Try the next server.
}
- timeout := time.Duration(ipc.NoTimeout)
- if deadline, hasDeadline := ctx.Deadline(); hasDeadline {
- timeout = deadline.Sub(time.Now())
- if err := flow.SetDeadline(deadline); err != nil {
- lastErr = verror.Internalf("ipc: flow.SetDeadline failed: %v", err)
- continue
- }
- }
+ flow.SetDeadline(ctx.Done())
// Validate caveats on the server's identity for the context associated with this call.
blessing, err := authorizeServer(flow.LocalID(), flow.RemoteID(), opts)
@@ -243,11 +236,18 @@
if doneChan := ctx.Done(); doneChan != nil {
go func() {
- <-ctx.Done()
- fc.Cancel()
+ select {
+ case <-ctx.Done():
+ fc.Cancel()
+ case <-fc.flow.Closed():
+ }
}()
}
+ timeout := time.Duration(ipc.NoTimeout)
+ if deadline, hasDeadline := ctx.Deadline(); hasDeadline {
+ timeout = deadline.Sub(time.Now())
+ }
if verr := fc.start(suffix, method, args, timeout, blessing); verr != nil {
return nil, verr
}
@@ -356,6 +356,7 @@
}
func (fc *flowClient) start(suffix, method string, args []interface{}, timeout time.Duration, blessing security.PublicID) verror.E {
+
req := ipc.Request{
Suffix: suffix,
Method: method,
