From 2be2f0890978695637a61745ecb08b110d5e7719 Mon Sep 17 00:00:00 2001 From: Esko Mobius Date: Wed, 18 Nov 2026 09:37:53 +0800 Subject: [PATCH] fix: skip expired entries when picking reusable connections for xhttp (#3479) --- transport/xhttp/reuse.go | 7 +++++-- transport/xhttp/reuse_test.go | 32 ++++++++++++++++++++++++++++++++ 2 files changed, 37 insertions(+), 2 deletions(-) diff --git a/transport/xhttp/reuse.go b/transport/xhttp/reuse.go index 624ea727..db1a5495 100644 --- a/transport/xhttp/reuse.go +++ b/transport/xhttp/reuse.go @@ -139,7 +139,7 @@ func (entry *reuseEntry) release() { } } -func (m *ReuseManager) pickLocked() *reuseEntry { +func (m *ReuseManager) pickLocked(now time.Time) *reuseEntry { var best *reuseEntry for _, entry := range m.entries { if entry.isClosed() { @@ -151,6 +151,9 @@ func (m *ReuseManager) pickLocked() *reuseEntry { if entry.maxReuseTimes > 0 && entry.reuseCount.Load() >= entry.maxReuseTimes { continue } + if !entry.unreusableAt.IsZero() && now.After(entry.unreusableAt) { + continue + } if m.maxConcurrency > 0 && int(entry.openUsage.Load()) >= m.maxConcurrency { continue } @@ -200,7 +203,7 @@ func (m *ReuseManager) GetTransport() http.RoundTripper { var entry *reuseEntry if !m.shouldCreateLocked() { - entry = m.pickLocked() + entry = m.pickLocked(now) } reused := entry != nil diff --git a/transport/xhttp/reuse_test.go b/transport/xhttp/reuse_test.go index eca033c6..78f477d3 100644 --- a/transport/xhttp/reuse_test.go +++ b/transport/xhttp/reuse_test.go @@ -160,6 +160,38 @@ func TestManagerRotateOnReusableSecs(t *testing.T) { manager.Close() } +func TestManagerSkipExpiredBusyEntry(t *testing.T) { + for name, cfg := range map[string]*ReuseConfig{ + "max-concurrency": {MaxConcurrency: "16", HMaxReusableSecs: "1"}, + "max-connections": {MaxConnections: "1", HMaxReusableSecs: "1"}, + } { + t.Run(name, func(t *testing.T) { + var created atomic.Int64 + + manager, err := NewReuseManager(cfg, makeTestTransportFactory(&created)) + if err != nil { + t.Fatal(err) + } + + transport1 := manager.GetTransport().(*ReuseTransport) + id1 := transportID(transport1) + + time.Sleep(1100 * time.Millisecond) + + transport2 := manager.GetTransport().(*ReuseTransport) + id2 := transportID(transport2) + + if id1 == id2 { + t.Fatalf("expected new transport after reusable timeout while busy, got same id %d", id1) + } + + transport1.Close() + transport2.Close() + manager.Close() + }) + } +} + func TestManagerRotateOnConnReuseLimit(t *testing.T) { var created atomic.Int64