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

etcdserver: apply entries when it is not empty

Browse Source 
Or it updates appliedi wrongly.
This commit is contained in:
Yicheng Qin 2014-12-08 15:54:52 -08:00
parent 6bfa5d409e
commit 7e06d85651
1 changed files with 7 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
etcdserver/server.go
View File

@ -455,8 +455,10 @@ func (s *EtcdServer) run() {
if appliedi+1-firsti < uint64(len(rd.CommittedEntries)) {
ents = rd.CommittedEntries[appliedi+1-firsti:]
}
if appliedi, shouldstop = s.apply(ents); shouldstop {
return
if len(ents) > 0 {
if appliedi, shouldstop = s.apply(ents); shouldstop {
return
}
}
}
@ -693,8 +695,9 @@ func getExpirationTime(r *pb.Request) time.Time {
return t
}
// apply takes an Entry received from Raft (after it has been committed) and
// applies it to the current state of the EtcdServer
// apply takes entries received from Raft (after it has been committed) and
// applies them to the current state of the EtcdServer.
// The given entries should not be empty.
func (s *EtcdServer) apply(es []raftpb.Entry) (uint64, bool) {
var applied uint64
for i := range es {