From 4dac42acad65d56154f5a9af63029cf676237871 Mon Sep 17 00:00:00 2001 From: Anders Roos Date: Tue, 5 May 2026 10:31:45 +0200 Subject: [PATCH 1/3] feat: respect context when wating for picker init --- transport.go | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/transport.go b/transport.go index 29a2e8f..df754ed 100644 --- a/transport.go +++ b/transport.go @@ -667,7 +667,16 @@ func (t *transportPool) getConnection(request *http.Request) (conn.Conn, func(), pickerPtr := t.picker.Load() if pickerPtr == nil { - <-t.pickerInitialized + if request == nil { + <-t.pickerInitialized + } else { + ctx := request.Context() + select { + case <-t.pickerInitialized: + case <-ctx.Done(): + return nil, nil, fmt.Errorf("picker not initialized: %w", ctx.Err()) + } + } pickerPtr = t.picker.Load() } From f07464e73e3ede54e3415c9f650f00686a50c015 Mon Sep 17 00:00:00 2001 From: Anders Roos <304849+andersroos@users.noreply.github.com> Date: Tue, 5 May 2026 15:11:25 +0200 Subject: [PATCH 2/3] Use suggestion from jhump. Co-authored-by: Joshua Humphries <2035234+jhump@users.noreply.github.com> --- transport.go | 17 ++++++++--------- 1 file changed, 8 insertions(+), 9 deletions(-) diff --git a/transport.go b/transport.go index df754ed..61b1e57 100644 --- a/transport.go +++ b/transport.go @@ -667,15 +667,14 @@ func (t *transportPool) getConnection(request *http.Request) (conn.Conn, func(), pickerPtr := t.picker.Load() if pickerPtr == nil { - if request == nil { - <-t.pickerInitialized - } else { - ctx := request.Context() - select { - case <-t.pickerInitialized: - case <-ctx.Done(): - return nil, nil, fmt.Errorf("picker not initialized: %w", ctx.Err()) - } + var doneCh <-chan struct{} + if request != nil { + doneCh = request.Context().Done() + } + select { + case <-t.pickerInitialized: + case <-doneCh: + return nil, nil, fmt.Errorf("picker not initialized: %w", ctx.Err()) } pickerPtr = t.picker.Load() } From 3bc3596a437ed88701582e75f328afc8a9dba74b Mon Sep 17 00:00:00 2001 From: Joshua Humphries <2035234+jhump@users.noreply.github.com> Date: Tue, 5 May 2026 10:04:14 -0400 Subject: [PATCH 3/3] Oops, fix compile error in previous suggestion --- transport.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/transport.go b/transport.go index 61b1e57..69c6213 100644 --- a/transport.go +++ b/transport.go @@ -674,7 +674,7 @@ func (t *transportPool) getConnection(request *http.Request) (conn.Conn, func(), select { case <-t.pickerInitialized: case <-doneCh: - return nil, nil, fmt.Errorf("picker not initialized: %w", ctx.Err()) + return nil, nil, fmt.Errorf("picker not initialized: %w", request.Context().Err()) } pickerPtr = t.picker.Load() }