From 72ffa74476290473a58ccff5ecea7ffabdc06682 Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Mon, 25 Jan 2016 06:55:54 +0800 Subject: [PATCH] pkg/transport: update timeout transport to reuse conn when timeout is not set --- pkg/transport/timeout_transport.go | 11 ++++++++--- 1 file changed, 8 insertions(+), 3 deletions(-) diff --git a/pkg/transport/timeout_transport.go b/pkg/transport/timeout_transport.go index 2b6df6e02..e3dbb6b22 100644 --- a/pkg/transport/timeout_transport.go +++ b/pkg/transport/timeout_transport.go @@ -23,14 +23,19 @@ import ( // NewTimeoutTransport returns a transport created using the given TLS info. // If read/write on the created connection blocks longer than its time limit, // it will return timeout error. +// If read/write timeout is set, transport will not be able to reuse connection. func NewTimeoutTransport(info TLSInfo, dialtimeoutd, rdtimeoutd, wtimeoutd time.Duration) (*http.Transport, error) { tr, err := NewTransport(info, dialtimeoutd) if err != nil { return nil, err } - // the timeouted connection will timeout soon after it is idle. - // it should not be put back to http transport as an idle connection for future usage. - tr.MaxIdleConnsPerHost = -1 + + if rdtimeoutd != 0 || wtimeoutd != 0 { + // the timeouted connection will timeout soon after it is idle. + // it should not be put back to http transport as an idle connection for future usage. + tr.MaxIdleConnsPerHost = -1 + } + tr.Dial = (&rwTimeoutDialer{ Dialer: net.Dialer{ Timeout: dialtimeoutd,