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 #2349 from yichengq/327

Browse Source 
rafthttp: fix panic on receiving empty ents
This commit is contained in:
Yicheng Qin 2015-02-20 15:15:43 -08:00
commit e54fdfd9cc
2 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
rafthttp/entry_reader.go
View File

@ -54,7 +54,9 @@ func (er *entryReader) readEntries() ([]raftpb.Entry, error) {
}
er.ents.Add()
}
er.lastIndex.Set(int64(ents[l-1].Index))
if l > 0 {
er.lastIndex.Set(int64(ents[l-1].Index))
}
return ents, nil
}

3
rafthttp/streamer.go
View File

@ -295,6 +295,9 @@ func (s *streamReader) handle(r io.Reader) {
}
return
}
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{