فهرست منبع

wal: not return ErrIndexNotFound in ReadAll

This IndexNotFound case is reasonable now because we don't write dummy
entries into wals any more.
Yicheng Qin 11 سال پیش
والد
کامیت
aa61009560
2فایلهای تغییر یافته به همراه2 افزوده شده و 7 حذف شده
  1. 0 5
      wal/wal.go
  2. 2 2
      wal/wal_test.go

+ 0 - 5
wal/wal.go

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

+ 2 - 2
wal/wal_test.go

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