Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

*: make dial timeout configurable

Browse Source 
Dial timeout is set shorter because
1. etcd is supposed to work in good environment, and the new value is long
enough
2. shorter dial timeout makes dial fail faster, which is good for
performance

Conflicts:
	etcdmain/etcd.go
This commit is contained in:
Yicheng Qin 2015-02-12 22:23:10 -08:00
parent 00d1d34cf8
commit 973cfbebda
5 changed files with 6 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
etcdmain/etcd.go
View File

@ -116,7 +116,7 @@ func startEtcd(cfg *config) (<-chan struct{}, error) {
return nil, fmt.Errorf("error setting up initial cluster: %v", err) return nil, fmt.Errorf("error setting up initial cluster: %v", err)
} }
pt, err := transport.NewTimeoutTransport(cfg.peerTLSInfo, rafthttp.ConnReadTimeout, rafthttp.ConnWriteTimeout) pt, err := transport.NewTimeoutTransport(cfg.peerTLSInfo, rafthttp.DialTimeout, rafthttp.ConnReadTimeout, rafthttp.ConnWriteTimeout)
if err != nil { if err != nil {
return nil, err return nil, err
} }

2
integration/cluster_test.go
View File

@ -663,7 +663,7 @@ func mustNewHTTPClient(t *testing.T, eps []string) client.HTTPClient {
} }
func mustNewTransport(t *testing.T) *http.Transport { func mustNewTransport(t *testing.T) *http.Transport {
tr, err := transport.NewTimeoutTransport(transport.TLSInfo{}, rafthttp.ConnReadTimeout, rafthttp.ConnWriteTimeout) tr, err := transport.NewTimeoutTransport(transport.TLSInfo{}, rafthttp.DialTimeout, rafthttp.ConnReadTimeout, rafthttp.ConnWriteTimeout)
if err != nil { if err != nil {
t.Fatal(err) t.Fatal(err)
} }

4
pkg/transport/timeout_transport.go
View File

@ -23,7 +23,7 @@ import (
// NewTimeoutTransport returns a transport created using the given TLS info. // NewTimeoutTransport returns a transport created using the given TLS info.
// If read/write on the created connection blocks longer than its time limit, // If read/write on the created connection blocks longer than its time limit,
// it will return timeout error. // it will return timeout error.
func NewTimeoutTransport(info TLSInfo, rdtimeoutd, wtimeoutd time.Duration) (*http.Transport, error) { func NewTimeoutTransport(info TLSInfo, dialtimeoutd, rdtimeoutd, wtimeoutd time.Duration) (*http.Transport, error) {
tr, err := NewTransport(info) tr, err := NewTransport(info)
if err != nil { if err != nil {
return nil, err return nil, err
@ -33,7 +33,7 @@ func NewTimeoutTransport(info TLSInfo, rdtimeoutd, wtimeoutd time.Duration) (*ht
tr.MaxIdleConnsPerHost = -1 tr.MaxIdleConnsPerHost = -1
tr.Dial = (&rwTimeoutDialer{ tr.Dial = (&rwTimeoutDialer{
Dialer: net.Dialer{ Dialer: net.Dialer{
Timeout: 30 * time.Second, Timeout: dialtimeoutd,
KeepAlive: 30 * time.Second, KeepAlive: 30 * time.Second,
}, },
rdtimeoutd: rdtimeoutd, rdtimeoutd: rdtimeoutd,

2
pkg/transport/timeout_transport_test.go
View File

@ -26,7 +26,7 @@ import (
// TestNewTimeoutTransport tests that NewTimeoutTransport returns a transport // TestNewTimeoutTransport tests that NewTimeoutTransport returns a transport
// that can dial out timeout connections. // that can dial out timeout connections.
func TestNewTimeoutTransport(t *testing.T) { func TestNewTimeoutTransport(t *testing.T) {
tr, err := NewTimeoutTransport(TLSInfo{}, time.Hour, time.Hour) tr, err := NewTimeoutTransport(TLSInfo{}, time.Hour, time.Hour, time.Hour)
if err != nil { if err != nil {
t.Fatalf("unexpected NewTimeoutTransport error: %v", err) t.Fatalf("unexpected NewTimeoutTransport error: %v", err)
} }

1
rafthttp/peer.go
View File

@ -40,6 +40,7 @@ const (
appRespBatchMs = 50 appRespBatchMs = 50
propBatchMs = 10 propBatchMs = 10
DialTimeout = time.Second
ConnReadTimeout = 5 * time.Second ConnReadTimeout = 5 * time.Second
ConnWriteTimeout = 5 * time.Second ConnWriteTimeout = 5 * time.Second
) )