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: fix the left logging using default log

Browse Source
This commit is contained in:
Xiang Li 2015-06-11 09:52:11 -07:00
parent 2db8b53c4b
commit 2373fd8426
1 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
wal/repair.go
View File

@ -16,7 +16,6 @@ package wal
import ( import (
"io" "io"
"log"
"os" "os"
"path" "path"
@ -58,35 +57,35 @@ func Repair(dirpath string) bool {
case io.EOF: case io.EOF:
return true return true
case io.ErrUnexpectedEOF: case io.ErrUnexpectedEOF:
log.Printf("wal: repairing %v", f.Name()) plog.Noticef("repairing %v", f.Name())
bf, bferr := os.Create(f.Name() + ".broken") bf, bferr := os.Create(f.Name() + ".broken")
if bferr != nil { if bferr != nil {
log.Printf("wal: could not repair %v, failed to create backup file", f.Name()) plog.Errorf("could not repair %v, failed to create backup file", f.Name())
return false return false
} }
defer bf.Close() defer bf.Close()
if _, err = f.Seek(0, os.SEEK_SET); err != nil { if _, err = f.Seek(0, os.SEEK_SET); err != nil {
log.Printf("wal: could not repair %v, failed to read file", f.Name()) plog.Errorf("could not repair %v, failed to read file", f.Name())
return false return false
} }
if _, err = io.Copy(bf, f); err != nil { if _, err = io.Copy(bf, f); err != nil {
log.Printf("wal: could not repair %v, failed to copy file", f.Name()) plog.Errorf("could not repair %v, failed to copy file", f.Name())
return false return false
} }
if err = f.Truncate(int64(n)); err != nil { if err = f.Truncate(int64(n)); err != nil {
log.Printf("wal: could not repair %v, failed to truncate file", f.Name()) plog.Errorf("could not repair %v, failed to truncate file", f.Name())
return false return false
} }
if err = f.Sync(); err != nil { if err = f.Sync(); err != nil {
log.Printf("wal: could not repair %v, failed to sync file", f.Name()) plog.Errorf("could not repair %v, failed to sync file", f.Name())
return false return false
} }
return true return true
default: default:
log.Printf("wal: could not repair error (%v)", err) plog.Errorf("could not repair error (%v)", err)
return false return false
} }
} }