Merge pull request #6219 from sinsharat/master

raft: handled panic for Term due to IOB
etcd-io · Aug 18, 2016 · 8021487 · 8021487
2 parents a8fc439 + 9b3b1f8
commit 8021487
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 2 deletions.
diff --git a/raft/log.go b/raft/log.go
@@ -232,7 +232,7 @@ func (l *raftLog) term(i uint64) (uint64, error) {
 	if err == nil {
 		return t, nil
 	}
-	if err == ErrCompacted {
+	if err == ErrCompacted || err == ErrUnavailable {
 		return 0, err
 	}
 	panic(err) // TODO(bdarnell)

diff --git a/raft/storage.go b/raft/storage.go
@@ -130,6 +130,9 @@ func (ms *MemoryStorage) Term(i uint64) (uint64, error) {
 	if i < offset {
 		return 0, ErrCompacted
 	}
+	if int(i-offset) >= len(ms.ents) {
+		return 0, ErrUnavailable
+	}
 	return ms.ents[i-offset].Term, nil
 }
 

diff --git a/raft/storage_test.go b/raft/storage_test.go
@@ -35,7 +35,7 @@ func TestStorageTerm(t *testing.T) {
 		{3, nil, 3, false},
 		{4, nil, 4, false},
 		{5, nil, 5, false},
-		{6, nil, 0, true},
+		{6, ErrUnavailable, 0, false},
 	}
 
 	for i, tt := range tests {