瀏覽代碼

Merge pull request #9282 from gyuho/raft-index

raft: reuse "last index" in "appendEntry"
Gyuho Lee 8 年之前
父節點
當前提交
af44780be1
共有 1 個文件被更改,包括 3 次插入2 次删除
  1. 3 2
      raft/raft.go

+ 3 - 2
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()
 }