Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

raft: move good case of truncateAndAppend to the first place

Browse Source
This commit is contained in:
Xiang Li 2014-12-02 13:05:55 -08:00
parent 411063e14f
commit b7ca56e3c8
1 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
raft/log_unstable.go
View File

@ -105,16 +105,16 @@ func (u *unstable) restore(s pb.Snapshot) {
func (u *unstable) truncateAndAppend(after uint64, ents []pb.Entry) { func (u *unstable) truncateAndAppend(after uint64, ents []pb.Entry) {
switch { switch {
case after == u.offset+uint64(len(u.entries))-1:
// after is the last index in the u.entries
// directly append
u.entries = append(u.entries, ents...)
case after < u.offset: case after < u.offset:
log.Printf("raftlog: replace the unstable entries from index %d", after+1) log.Printf("raftlog: replace the unstable entries from index %d", after+1)
// The log is being truncated to before our current offset // The log is being truncated to before our current offset
// portion, so set the offset and replace the entries // portion, so set the offset and replace the entries
u.offset = after + 1 u.offset = after + 1
u.entries = ents u.entries = ents
case after == u.offset+uint64(len(u.entries))-1:
// after is the last index in the u.entries
// directly append
u.entries = append(u.entries, ents...)
default: default:
// truncate to after and copy to u.entries // truncate to after and copy to u.entries
// then append // then append