Merge remote-tracking branch 'origin/0.4' into 0.4-writer

huangfu · Aug 7, 2020 · 4a3000a · 4a3000a
2 parents 1f8e499 + b0b1cdc
commit 4a3000a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/transport.go b/transport.go
@@ -878,7 +878,7 @@ func (g *connGroup) grabConnOrConnect(ctx context.Context) (*conn, error) {
 		errChan := make(chan error)
 
 		go func() {
-			c, err := g.connect()
+			c, err := g.connect(ctx)
 			if err != nil {
 				select {
 				case errChan <- err:
@@ -972,10 +972,10 @@ func (g *connGroup) releaseConn(c *conn) bool {
 	return true
 }
 
-func (g *connGroup) connect() (*conn, error) {
+func (g *connGroup) connect(ctx context.Context) (*conn, error) {
 	deadline := time.Now().Add(g.pool.dialTimeout)
 
-	ctx, cancel := context.WithDeadline(context.Background(), deadline)
+	ctx, cancel := context.WithDeadline(ctx, deadline)
 	defer cancel()
 
 	var network = strings.Split(g.addr.Network(), ",")