http2: dial retry should respect to request timeout

Taction · Taction · commit f52009757f67 · 2024-06-04T23:53:54.000+08:00
diff --git a/http2/client_conn_pool.go b/http2/client_conn_pool.go
@@ -94,9 +94,13 @@ func (p *clientConnPool) getClientConn(req *http.Request, addr string, dialOnMis
 		traceGetConn(req, addr)
 		call := p.getStartDialLocked(req.Context(), addr)
 		p.mu.Unlock()
-		<-call.done
-		if shouldRetryDial(call, req) {
-			continue
+		select {
+		case <-call.done:
+			if shouldRetryDial(call, req) {
+				continue
+			}
+		case <-req.Context().Done():
+			return nil, req.Context().Err()
 		}
 		cc, err := call.res, call.err
 		if err != nil {
