Browse Source

Merge pull request #5774 from gyuho/raft_minor_fix

raft: len(entries) before Lock, use firstIndex
Gyu-Ho Lee 9 years ago
parent
commit
ae6e879812
1 changed files with 5 additions and 3 deletions
  1. 5 3
      raft/storage.go

+ 5 - 3
raft/storage.go

@@ -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.