mirrors/etcd
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

wal: not return ErrIndexNotFound in ReadAll

Browse Source 
This IndexNotFound case is reasonable now because we don't write dummy
entries into wals any more.
This commit is contained in:
Yicheng Qin
2014-12-02 00:17:05 -08:00
parent f34fe6e4ae
commit aa61009560
2 changed files with 2 additions and 7 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
wal/wal.go
View File

@ -46,7 +46,6 @@ const (
var ( var (
ErrMetadataConflict = errors.New("wal: conflicting metadata found") ErrMetadataConflict = errors.New("wal: conflicting metadata found")
ErrFileNotFound = errors.New("wal: file not found") ErrFileNotFound = errors.New("wal: file not found")
ErrIndexNotFound = errors.New("wal: index not found in file")
ErrCRCMismatch = errors.New("wal: crc mismatch") ErrCRCMismatch = errors.New("wal: crc mismatch")
crcTable = crc32.MakeTable(crc32.Castagnoli) crcTable = crc32.MakeTable(crc32.Castagnoli)
) )
@ -204,10 +203,6 @@ func (w *WAL) ReadAll() (metadata []byte, state raftpb.HardState, ents []raftpb.
state.Reset() state.Reset()
return nil, state, nil, err return nil, state, nil, err
} }
if w.enti < w.ri {
state.Reset()
return nil, state, nil, ErrIndexNotFound
}
// close decoder, disable reading // close decoder, disable reading
w.decoder.close() w.decoder.close()

4
wal/wal_test.go
View File

@ -364,8 +364,8 @@ func TestOpenAtUncommittedIndex(t *testing.T) {
t.Fatal(err) t.Fatal(err)
} }
// commit up to index 0, try to read index 1 // commit up to index 0, try to read index 1
if _, _, _, err := w.ReadAll(); err != ErrIndexNotFound { if _, _, _, err := w.ReadAll(); err != nil {
t.Errorf("err = %v, want %v", err, ErrIndexNotFound) t.Errorf("err = %v, want nil", err)
} }
w.Close() w.Close()
} }