From 5f0c12249653edd1418ace4118e8c725e0f1328e Mon Sep 17 00:00:00 2001 From: Xiang Li Date: Mon, 8 Aug 2016 10:44:02 -0700 Subject: [PATCH] raft: fix getting unapplied log entries --- raft/raft.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/raft/raft.go b/raft/raft.go index cb4feac4f..adef48e72 100644 --- a/raft/raft.go +++ b/raft/raft.go @@ -574,9 +574,9 @@ func (r *raft) poll(id uint64, v bool) (granted int) { func (r *raft) Step(m pb.Message) error { if m.Type == pb.MsgHup { if r.state != StateLeader { - ents, err := r.raftLog.entries(r.raftLog.applied+1, r.raftLog.committed-r.raftLog.applied) + ents, err := r.raftLog.slice(r.raftLog.applied+1, r.raftLog.committed+1, noLimit) if err != nil { - r.logger.Panicf("unexpected error getting uncommitted entries (%v)", err) + r.logger.Panicf("unexpected error getting unapplied entries (%v)", err) } if n := numOfPendingConf(ents); n != 0 && r.raftLog.committed > r.raftLog.applied { r.logger.Warningf("%x cannot campaign at term %d since there are still %d pending configuration changes to apply", r.id, r.Term, n)