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 #2713 from xiaost/etcdserver-skip-empty-entry

Browse Source 
etcdserver: apply: skip empty Entry
This commit is contained in:
Xiang Li 2015-04-23 21:24:25 -07:00
commit b5d4d9ae9b
1 changed files with 5 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etcdserver/server.go
View File

@ -669,6 +669,11 @@ func (s *EtcdServer) apply(es []raftpb.Entry, confState *raftpb.ConfState) (uint
e := es[i] e := es[i]
switch e.Type { switch e.Type {
case raftpb.EntryNormal: case raftpb.EntryNormal:
// raft state machine may generate noop entry when leader confirmation.
// skip it in advance to avoid some potential bug in the future
if len(e.Data) == 0 {
break
}
var r pb.Request var r pb.Request
pbutil.MustUnmarshal(&r, e.Data) pbutil.MustUnmarshal(&r, e.Data)
s.w.Trigger(r.ID, s.applyRequest(r)) s.w.Trigger(r.ID, s.applyRequest(r))