Merge pull request #1316 from coryb/goroutine-leak

ensure context is cancelled to prevent goroutine leaks from grpc.newClientStream
moby · Jan 17, 2020 · 8a26782 · 8a26782
2 parents aa4311b + 463fc8d
commit 8a26782
Showing 1 changed file with 3 additions and 1 deletion.
diff --git a/util/flightcontrol/flightcontrol.go b/util/flightcontrol/flightcontrol.go
@@ -116,7 +116,9 @@ func newCall(fn func(ctx context.Context) (interface{}, error)) *call {
 
 func (c *call) run() {
 	defer c.closeProgressWriter()
-	v, err := c.fn(c.ctx)
+	ctx, cancel := context.WithCancel(c.ctx)
+	defer cancel()
+	v, err := c.fn(ctx)
 	c.mu.Lock()
 	c.result = v
 	c.err = err