|
|
@@ -1039,7 +1039,7 @@ func stepLeader(r *raft, m pb.Message) error {
|
|
|
pr.RecentActive = true
|
|
|
|
|
|
if m.Reject {
|
|
|
- r.logger.Debugf("%x received msgApp rejection(lastindex: %d) from %x for index %d",
|
|
|
+ r.logger.Debugf("%x received MsgAppResp(MsgApp was rejected, lastindex: %d) from %x for index %d",
|
|
|
r.id, m.RejectHint, m.From, m.Index)
|
|
|
if pr.maybeDecrTo(m.Index, m.RejectHint) {
|
|
|
r.logger.Debugf("%x decreased progress of %x to [%s]", r.id, m.From, pr)
|
|
|
@@ -1130,8 +1130,8 @@ func stepLeader(r *raft, m pb.Message) error {
|
|
|
pr.becomeProbe()
|
|
|
r.logger.Debugf("%x snapshot failed, resumed sending replication messages to %x [%s]", r.id, m.From, pr)
|
|
|
}
|
|
|
- // If snapshot finish, wait for the msgAppResp from the remote node before sending
|
|
|
- // out the next msgApp.
|
|
|
+ // If snapshot finish, wait for the MsgAppResp from the remote node before sending
|
|
|
+ // out the next MsgApp.
|
|
|
// If snapshot failure, wait for a heartbeat interval before next try
|
|
|
pr.pause()
|
|
|
case pb.MsgUnreachable:
|
|
|
@@ -1290,7 +1290,7 @@ func (r *raft) handleAppendEntries(m pb.Message) {
|
|
|
if mlastIndex, ok := r.raftLog.maybeAppend(m.Index, m.LogTerm, m.Commit, m.Entries...); ok {
|
|
|
r.send(pb.Message{To: m.From, Type: pb.MsgAppResp, Index: mlastIndex})
|
|
|
} else {
|
|
|
- r.logger.Debugf("%x [logterm: %d, index: %d] rejected msgApp [logterm: %d, index: %d] from %x",
|
|
|
+ r.logger.Debugf("%x [logterm: %d, index: %d] rejected MsgApp [logterm: %d, index: %d] from %x",
|
|
|
r.id, r.raftLog.zeroTermOnErrCompacted(r.raftLog.term(m.Index)), m.Index, m.LogTerm, m.Index, m.From)
|
|
|
r.send(pb.Message{To: m.From, Type: pb.MsgAppResp, Index: m.Index, Reject: true, RejectHint: r.raftLog.lastIndex()})
|
|
|
}
|
kane