Merge pull request #1106 from dfawley/cc_cancel

menghanl · web-flow · commit 0e5ab0098fc5 · 2017-03-06T12:00:49.000-08:00
Add comment explaining why cancel is not called in success path after client transport is created
diff --git a/clientconn.go b/clientconn.go
@@ -777,6 +777,8 @@ func (ac *addrConn) resetTransport(closeTransport bool) error {
 			Metadata: ac.addr.Metadata,
 		}
 		newTransport, err := transport.NewClientTransport(ctx, sinfo, ac.dopts.copts)
+		// Don't call cancel in success path due to a race in Go 1.6:
+		// https://github.com/golang/go/issues/15078.
 		if err != nil {
 			cancel()
 

Original file line number	Diff line number	Diff line change
`@@ -777,6 +777,8 @@ func (ac *addrConn) resetTransport(closeTransport bool) error {`
`777`	`777`	`Metadata: ac.addr.Metadata,`
`778`	`778`	`}`
`779`	`779`	`newTransport, err := transport.NewClientTransport(ctx, sinfo, ac.dopts.copts)`
	`780`	`+ // Don't call cancel in success path due to a race in Go 1.6:`
	`781`	`+ // https://github.com/golang/go/issues/15078.`
`780`	`782`	`if err != nil {`
`781`	`783`	`cancel()`
`782`	`784`