Close consumed WAL segments, verify checksums on read

pull/5805/head
Fabian Reinartz 8 years ago
parent eeb03e97e2
commit 84e8027a8e

@ -97,7 +97,7 @@ type walHandler struct {
// ReadAll consumes all entries in the WAL and triggers the registered handlers. // ReadAll consumes all entries in the WAL and triggers the registered handlers.
func (w *WAL) ReadAll(h *walHandler) error { func (w *WAL) ReadAll(h *walHandler) error {
for _, f := range w.files { for i, f := range w.files {
dec := newWALDecoder(f, h) dec := newWALDecoder(f, h)
for { for {
@ -109,6 +109,13 @@ func (w *WAL) ReadAll(h *walHandler) error {
return err return err
} }
} }
// Close completed file after we are done reading it.
if i < len(w.files)-1 {
if err := f.Close(); err != nil {
return err
}
}
} }
return nil return nil
} }
@ -524,14 +531,19 @@ func (d *walDecoder) entry() error {
} }
buf := d.buf[:length] buf := d.buf[:length]
if _, err := d.r.Read(buf); err != nil { cw := crc32.NewIEEE()
tr := io.TeeReader(d.r, cw)
if _, err := tr.Read(buf); err != nil {
return err return err
} }
// Read away checksum. _, err := d.r.Read(b[:4])
// TODO(fabxc): verify it if err != nil {
if _, err := d.r.Read(b[:4]); err != nil {
return err return err
} }
if exp, has := binary.BigEndian.Uint32(b[:4]), cw.Sum32(); has != exp {
return errors.Errorf("unexpected CRC32 checksum %x, want %x", has, exp)
}
switch etype { switch etype {
case WALEntrySeries: case WALEntrySeries:

Loading…
Cancel
Save