Merge pull request #9282 from gyuho/raft-index

raft: reuse "last index" in "appendEntry"
etcd-io · Feb 6, 2018 · af44780 · af44780
2 parents 3903385 + 2b7c12f
commit af44780
Showing 1 changed file with 3 additions and 2 deletions.
diff --git a/raft/raft.go b/raft/raft.go
@@ -604,8 +604,9 @@ func (r *raft) appendEntry(es ...pb.Entry) {
 		es[i].Term = r.Term
 		es[i].Index = li + 1 + uint64(i)
 	}
-	r.raftLog.append(es...)
-	r.getProgress(r.id).maybeUpdate(r.raftLog.lastIndex())
+	// use latest "last" index after truncate/append
+	li = r.raftLog.append(es...)
+	r.getProgress(r.id).maybeUpdate(li)
 	// Regardless of maybeCommit's return, our caller will call bcastAppend.
 	r.maybeCommit()
 }