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

Merge pull request #5774 from gyuho/raft_minor_fix

Browse Source 
raft: len(entries) before Lock, use firstIndex
This commit is contained in:
Gyu-Ho Lee 2016-06-25 11:13:16 -07:00 committed by GitHub
commit ae6e879812
1 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
raft/storage.go
View File

@ -226,12 +226,14 @@ func (ms *MemoryStorage) Compact(compactIndex uint64) error {
// TODO (xiangli): ensure the entries are continuous and
// entries[0].Index > ms.entries[0].Index
func (ms *MemoryStorage) Append(entries []pb.Entry) error {
ms.Lock()
defer ms.Unlock()
if len(entries) == 0 {
return nil
}
first := ms.ents[0].Index + 1
ms.Lock()
defer ms.Unlock()
first := ms.firstIndex()
last := entries[0].Index + uint64(len(entries)) - 1
// shortcut if there is no new entry.