Mirroristas/etcd
2
0
Fork 0
mirror of https://github.com/etcd-io/etcd.git synced 2024-09-27 06:25:44 +00:00
Code Issues Packages Projects Releases Wiki Activity

wal: propagate errors

Browse Source
This commit is contained in:
Jonathan Boulle 2014-11-07 14:41:34 -08:00
parent aca58ec605
commit 5a964f49a5
1 changed files with 16 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
wal/wal.go
View File

@ -97,7 +97,9 @@ func Create(dirpath string, metadata []byte) (*WAL, error) {
if err := w.encoder.encode(&walpb.Record{Type: metadataType, Data: metadata}); err != nil { if err := w.encoder.encode(&walpb.Record{Type: metadataType, Data: metadata}); err != nil {
return nil, err return nil, err
} }
w.Sync() if err = w.sync(); err != nil {
return nil, err
}
return w, nil return w, nil
} }
@ -225,7 +227,9 @@ func (w *WAL) Cut() error {
if err != nil { if err != nil {
return err return err
} }
w.Sync() if err = w.sync(); err != nil {
return err
}
w.f.Close() w.f.Close()
// update writer and save the previous crc // update writer and save the previous crc
@ -239,7 +243,7 @@ func (w *WAL) Cut() error {
return w.encoder.encode(&walpb.Record{Type: metadataType, Data: w.metadata}) return w.encoder.encode(&walpb.Record{Type: metadataType, Data: w.metadata})
} }
func (w *WAL) Sync() error { func (w *WAL) sync() error {
if w.encoder != nil { if w.encoder != nil {
if err := w.encoder.flush(); err != nil { if err := w.encoder.flush(); err != nil {
return err return err
@ -248,11 +252,16 @@ func (w *WAL) Sync() error {
return w.f.Sync() return w.f.Sync()
} }
func (w *WAL) Close() { func (w *WAL) Close() error {
if w.f != nil { if w.f != nil {
w.Sync() if err := w.sync(); err != nil {
w.f.Close() return err
}
if err := w.f.Close(); err != nil {
return err
}
} }
return nil
} }
func (w *WAL) SaveEntry(e *raftpb.Entry) error { func (w *WAL) SaveEntry(e *raftpb.Entry) error {
@ -284,7 +293,7 @@ func (w *WAL) Save(st raftpb.HardState, ents []raftpb.Entry) error {
return err return err
} }
} }
return w.Sync() return w.sync()
} }
func (w *WAL) saveCrc(prevCrc uint32) error { func (w *WAL) saveCrc(prevCrc uint32) error {