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

etcdserver: pass http client into Sender

release-2.0
Brian Waldon 2014-09-23 08:38:26 -07:00
parent db12e5704b
commit 5470a6d3d6
3 changed files with 20 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
etcdserver/etcdhttp/peers.go
View File

@ -85,17 +85,18 @@ func (ps Peers) Endpoints() []string {
return endpoints return endpoints
} }
func Sender(p Peers) func(msgs []raftpb.Message) { func Sender(t *http.Transport, p Peers) func(msgs []raftpb.Message) {
c := &http.Client{Transport: t}
return func(msgs []raftpb.Message) { return func(msgs []raftpb.Message) {
for _, m := range msgs { for _, m := range msgs {
// TODO: reuse go routines // TODO: reuse go routines
// limit the number of outgoing connections for the same receiver // limit the number of outgoing connections for the same receiver
go send(p, m) go send(c, p, m)
} }
} }
} }
func send(p Peers, m raftpb.Message) { func send(c *http.Client, p Peers, m raftpb.Message) {
// TODO (xiangli): reasonable retry logic // TODO (xiangli): reasonable retry logic
for i := 0; i < 3; i++ { for i := 0; i < 3; i++ {
url := p.Pick(m.To) url := p.Pick(m.To)
@ -116,16 +117,15 @@ func send(p Peers, m raftpb.Message) {
log.Println("etcdhttp: dropping message:", err) log.Println("etcdhttp: dropping message:", err)
return // drop bad message return // drop bad message
} }
if httpPost(url, data) { if httpPost(c, url, data) {
return // success return // success
} }
// TODO: backoff // TODO: backoff
} }
} }
func httpPost(url string, data []byte) bool { func httpPost(c *http.Client, url string, data []byte) bool {
// TODO: set timeouts resp, err := c.Post(url, "application/protobuf", bytes.NewBuffer(data))
resp, err := http.Post(url, "application/protobuf", bytes.NewBuffer(data))
if err != nil { if err != nil {
elog.TODO() elog.TODO()
return false return false

6
etcdserver/etcdhttp/peers_test.go
View File

@ -148,7 +148,7 @@ func TestHttpPost(t *testing.T) {
} }
for i, tt := range tests { for i, tt := range tests {
ts := httptest.NewServer(tt.h) ts := httptest.NewServer(tt.h)
if g := httpPost(ts.URL, []byte("adsf")); g != tt.w { if g := httpPost(http.DefaultClient, ts.URL, []byte("adsf")); g != tt.w {
t.Errorf("#%d: httpPost()=%t, want %t", i, g, tt.w) t.Errorf("#%d: httpPost()=%t, want %t", i, g, tt.w)
} }
if tr.Method != "POST" { if tr.Method != "POST" {
@ -161,7 +161,7 @@ func TestHttpPost(t *testing.T) {
ts.Close() ts.Close()
} }
if httpPost("garbage url", []byte("data")) { if httpPost(http.DefaultClient, "garbage url", []byte("data")) {
t.Errorf("httpPost with bad URL returned true unexpectedly!") t.Errorf("httpPost with bad URL returned true unexpectedly!")
} }
} }
@ -215,7 +215,7 @@ func TestSend(t *testing.T) {
ps := Peers{ ps := Peers{
42: []string{strings.TrimPrefix(ts.URL, "http://")}, 42: []string{strings.TrimPrefix(ts.URL, "http://")},
} }
send(ps, tt.m) send(http.DefaultClient, ps, tt.m)
if !tt.ok { if !tt.ok {
if tr != nil { if tr != nil {

11
main.go
View File

@ -151,6 +151,15 @@ func startEtcd() {
n = raft.RestartNode(id, peers.IDs(), 10, 1, snapshot, st, ents) n = raft.RestartNode(id, peers.IDs(), 10, 1, snapshot, st, ents)
} }
pt := &http.Transport{
// timeouts copied from http.DefaultTransport
Dial: (&net.Dialer{
Timeout: 30 * time.Second,
KeepAlive: 30 * time.Second,
}).Dial,
TLSHandshakeTimeout: 10 * time.Second,
}
s := &etcdserver.EtcdServer{ s := &etcdserver.EtcdServer{
Store: st, Store: st,
Node: n, Node: n,
@ -158,7 +167,7 @@ func startEtcd() {
*wal.WAL *wal.WAL
*snap.Snapshotter *snap.Snapshotter
}{w, snapshotter}, }{w, snapshotter},
Send: etcdhttp.Sender(*peers), Send: etcdhttp.Sender(pt, *peers),
Ticker: time.Tick(100 * time.Millisecond), Ticker: time.Tick(100 * time.Millisecond),
SyncTicker: time.Tick(500 * time.Millisecond), SyncTicker: time.Tick(500 * time.Millisecond),
SnapCount: *snapCount, SnapCount: *snapCount,