Selaa lähdekoodia

Merge pull request #6129 from xiang90/fix_raft

raft: fix getting unapplied log entries
Xiang Li 9 vuotta sitten
vanhempi
commit
c7e4198742
1 muutettua tiedostoa jossa 2 lisäystä ja 2 poistoa
  1. 2 2
      raft/raft.go

+ 2 - 2
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)