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 #2272 from yichengq/324

Browse Source 
rafthttp: not send 0-entry MsgApp using stream
This commit is contained in:
Yicheng Qin
2015-02-10 09:40:32 -08:00
parent 84dac75ed5 96fde55a0f
commit 9ec8ea47c8
1 changed files with 6 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
rafthttp/streamer.go
View File

@@ -194,6 +194,12 @@ func (s *streamWriter) handle(w WriteFlusher) {
ew := newEntryWriter(w, s.to)
defer ew.stop()
for ents := range s.q {
// Considering Commit in MsgApp is not recovered when received,
// zero-entry appendEntry messages have no use to raft state machine.
// Drop it here because it is useless.
if len(ents) == 0 {
continue
}
start := time.Now()
if err := ew.writeEntries(ents); err != nil {
log.Printf("rafthttp: encountered error writing to server log stream: %v", err)
@@ -289,12 +295,6 @@ func (s *streamReader) handle(r io.Reader) {
}
return
}
// Considering Commit in MsgApp is not recovered, zero-entry appendEntry
// messages have no use to raft state machine. Drop it here because
// we don't have easy way to recover its Index easily.
if len(ents) == 0 {
continue
}
// The commit index field in appendEntry message is not recovered.
// The follower updates its commit index through heartbeat.
msg := raftpb.Message{