mirror of
https://github.com/MetaCubeX/mihomo.git
synced 2026-11-22 10:03:33 +00:00
fix: skip expired entries when picking reusable connections for xhttp (#3479)
This commit is contained in:
1 parent
0976eb6ac1
commit
2be2f08909
2 files changed
+37
-2
No files matched your search
@@ -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
|
||||
|
||||
|
||||
@@ -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
|
||||
|
||||
|
||||
Reference in new issue
Block a user