Merge pull request etcd-io#5960 from xiang90/a_i

etcdserver: set applied index correctly
adamgomulka · Jul 17, 2016 · 336e4f2 · 336e4f2
2 parents d9e939d + 2d761d6
commit 336e4f2
Showing 1 changed file with 1 addition and 1 deletion.
diff --git a/etcdserver/server.go b/etcdserver/server.go
@@ -1044,6 +1044,7 @@ func (s *EtcdServer) applyEntryNormal(e *raftpb.Entry) {
 		s.consistIndex.setConsistentIndex(e.Index)
 		shouldApplyV3 = true
 	}
+	defer s.setAppliedIndex(e.Index)
 
 	// raft state machine may generate noop entry when leader confirmation.
 	// skip it in advance to avoid some potential bug in the future
@@ -1082,7 +1083,6 @@ func (s *EtcdServer) applyEntryNormal(e *raftpb.Entry) {
 	if s.w.IsRegistered(id) || !noSideEffect(&raftReq) {
 		ar = s.applyV3.Apply(&raftReq)
 	}
-	s.setAppliedIndex(e.Index)
 
 	if ar == nil {
 		return