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

Merge pull request #1726 from xiang90/fix_sender

Browse Source 
etcdserver: add buffer to the sender queue
This commit is contained in:
Xiang Li 2014-11-14 16:13:32 -08:00
commit a817ca705b
2 changed files with 15 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
etcdserver/sender.go
View File

@ -34,6 +34,7 @@ import (
const ( const (
raftPrefix = "/raft" raftPrefix = "/raft"
connPerSender = 4 connPerSender = 4
senderBufSize = connPerSender * 4
) )
type sendHub struct { type sendHub struct {
@ -150,7 +151,7 @@ func newSender(tr http.RoundTripper, u string, cid types.ID, fs *stats.FollowerS
u: u, u: u,
cid: cid, cid: cid,
fs: fs, fs: fs,
q: make(chan []byte), q: make(chan []byte, senderBufSize),
shouldstop: shouldstop, shouldstop: shouldstop,
} }
s.wg.Add(connPerSender) s.wg.Add(connPerSender)

29
etcdserver/sender_test.go
View File

@ -97,9 +97,6 @@ func TestSendHubShouldStop(t *testing.T) {
cl := newTestCluster(membs) cl := newTestCluster(membs)
ls := stats.NewLeaderStats("") ls := stats.NewLeaderStats("")
h := newSendHub(tr, cl, nil, ls) h := newSendHub(tr, cl, nil, ls)
// wait for handle goroutines start
// TODO: wait for goroutines ready before return newSender
time.Sleep(10 * time.Millisecond)
shouldstop := h.ShouldStopNotify() shouldstop := h.ShouldStopNotify()
select { select {
@ -123,9 +120,7 @@ func TestSenderSend(t *testing.T) {
tr := &roundTripperRecorder{} tr := &roundTripperRecorder{}
fs := &stats.FollowerStats{} fs := &stats.FollowerStats{}
s := newSender(tr, "http://10.0.0.1", types.ID(1), fs, nil) s := newSender(tr, "http://10.0.0.1", types.ID(1), fs, nil)
// wait for handle goroutines start
// TODO: wait for goroutines ready before return newSender
time.Sleep(10 * time.Millisecond)
if err := s.send([]byte("some data")); err != nil { if err := s.send([]byte("some data")); err != nil {
t.Fatalf("unexpect send error: %v", err) t.Fatalf("unexpect send error: %v", err)
} }
@ -145,22 +140,26 @@ func TestSenderExceedMaximalServing(t *testing.T) {
tr := newRoundTripperBlocker() tr := newRoundTripperBlocker()
fs := &stats.FollowerStats{} fs := &stats.FollowerStats{}
s := newSender(tr, "http://10.0.0.1", types.ID(1), fs, nil) s := newSender(tr, "http://10.0.0.1", types.ID(1), fs, nil)
// wait for handle goroutines start
// TODO: wait for goroutines ready before return newSender // keep the sender busy and make the buffer full
time.Sleep(10 * time.Millisecond) // nothing can go out as we block the sender
// It could handle that many requests at the same time. for i := 0; i < connPerSender+senderBufSize; i++ {
for i := 0; i < connPerSender; i++ {
if err := s.send([]byte("some data")); err != nil { if err := s.send([]byte("some data")); err != nil {
t.Errorf("send err = %v, want nil", err) t.Errorf("send err = %v, want nil", err)
} }
// force the sender to grab data
testutil.ForceGosched()
} }
// This one exceeds its maximal serving ability
// try to send a data when we are sure the buffer is full
if err := s.send([]byte("some data")); err == nil { if err := s.send([]byte("some data")); err == nil {
t.Errorf("unexpect send success") t.Errorf("unexpect send success")
} }
// unblock the senders and force them to send out the data
tr.unblock() tr.unblock()
// Make handles finish their post
testutil.ForceGosched() testutil.ForceGosched()
// It could send new data after previous ones succeed // It could send new data after previous ones succeed
if err := s.send([]byte("some data")); err != nil { if err := s.send([]byte("some data")); err != nil {
t.Errorf("send err = %v, want nil", err) t.Errorf("send err = %v, want nil", err)
@ -173,9 +172,7 @@ func TestSenderExceedMaximalServing(t *testing.T) {
func TestSenderSendFailed(t *testing.T) { func TestSenderSendFailed(t *testing.T) {
fs := &stats.FollowerStats{} fs := &stats.FollowerStats{}
s := newSender(newRespRoundTripper(0, errors.New("blah")), "http://10.0.0.1", types.ID(1), fs, nil) s := newSender(newRespRoundTripper(0, errors.New("blah")), "http://10.0.0.1", types.ID(1), fs, nil)
// wait for handle goroutines start
// TODO: wait for goroutines ready before return newSender
time.Sleep(10 * time.Millisecond)
if err := s.send([]byte("some data")); err != nil { if err := s.send([]byte("some data")); err != nil {
t.Fatalf("unexpect send error: %v", err) t.Fatalf("unexpect send error: %v", err)
} }