vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pkg/transport: update timeout transport to reuse conn when timeout is not set

release-2.3
Xiang Li 2016-01-25 06:55:54 +08:00
parent 5e2dbadbc0
commit 72ffa74476
1 changed files with 8 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
pkg/transport/timeout_transport.go
View File

@ -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,