Merge pull request #1897 from xiang90/raft

raft: get rid of the using of defer in critical path

raft/log.go

@@ -272,11 +272,16 @@ func (l *raftLog) slice(lo uint64, hi uint64) []pb.Entry {
 		} else if err != nil {
 			panic(err) // TODO(bdarnell)
 		}
-		ents = append(ents, storedEnts...)
+		ents = storedEnts
 	}
 	if hi > l.unstable.offset {
 		unstable := l.unstable.slice(max(lo, l.unstable.offset), hi)
+		if len(ents) > 0 {
+			ents = append([]pb.Entry{}, ents...)
 			ents = append(ents, unstable...)
+		} else {
+			ents = unstable
+		}
 	}
 	return ents
 }

raft/raft.go

@@ -410,12 +410,10 @@ func (r *raft) poll(id uint64, v bool) (granted int) {
 }
 
 func (r *raft) Step(m pb.Message) error {
-	// TODO(bmizerany): this likely allocs - prevent that.
-	defer func() { r.Commit = r.raftLog.committed }()
-
 	if m.Type == pb.MsgHup {
 		log.Printf("raft: %x is starting a new election at term %d", r.id, r.Term)
 		r.campaign()
+		r.Commit = r.raftLog.committed
 		return nil
 	}
 
@@ -437,6 +435,7 @@ func (r *raft) Step(m pb.Message) error {
 		return nil
 	}
 	r.step(r, m)
+	r.Commit = r.raftLog.committed
 	return nil
 }