vitalif
/
etcd
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

*: rename logger to plog

release-2.1
Xiang Li 2015-06-02 14:58:24 -07:00
parent 28878e34ff
commit 711451ce2d
3 changed files with 14 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
snap/snapshotter.go
View File

@ -38,7 +38,7 @@ const (
) )
var ( var (
logger = capnslog.NewPackageLogger("github.com/coreos/etcd", "snap") plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "snap")
ErrNoSnapshot = errors.New("snap: no available snapshot") ErrNoSnapshot = errors.New("snap: no available snapshot")
ErrEmptySnapshot = errors.New("snap: empty snapshot") ErrEmptySnapshot = errors.New("snap: empty snapshot")
@ -111,30 +111,30 @@ func loadSnap(dir, name string) (*raftpb.Snapshot, error) {
func Read(snapname string) (*raftpb.Snapshot, error) { func Read(snapname string) (*raftpb.Snapshot, error) {
b, err := ioutil.ReadFile(snapname) b, err := ioutil.ReadFile(snapname)
if err != nil { if err != nil {
logger.Errorf("cannot read file %v: %v", snapname, err) plog.Errorf("cannot read file %v: %v", snapname, err)
return nil, err return nil, err
} }
var serializedSnap snappb.Snapshot var serializedSnap snappb.Snapshot
if err = serializedSnap.Unmarshal(b); err != nil { if err = serializedSnap.Unmarshal(b); err != nil {
logger.Errorf("corrupted snapshot file %v: %v", snapname, err) plog.Errorf("corrupted snapshot file %v: %v", snapname, err)
return nil, err return nil, err
} }
if len(serializedSnap.Data) == 0 || serializedSnap.Crc == 0 { if len(serializedSnap.Data) == 0 || serializedSnap.Crc == 0 {
logger.Errorf("unexpected empty snapshot") plog.Errorf("unexpected empty snapshot")
return nil, ErrEmptySnapshot return nil, ErrEmptySnapshot
} }
crc := crc32.Update(0, crcTable, serializedSnap.Data) crc := crc32.Update(0, crcTable, serializedSnap.Data)
if crc != serializedSnap.Crc { if crc != serializedSnap.Crc {
logger.Errorf("corrupted snapshot file %v: crc mismatch", snapname) plog.Errorf("corrupted snapshot file %v: crc mismatch", snapname)
return nil, ErrCRCMismatch return nil, ErrCRCMismatch
} }
var snap raftpb.Snapshot var snap raftpb.Snapshot
if err = snap.Unmarshal(serializedSnap.Data); err != nil { if err = snap.Unmarshal(serializedSnap.Data); err != nil {
logger.Errorf("corrupted snapshot file %v: %v", snapname, err) plog.Errorf("corrupted snapshot file %v: %v", snapname, err)
return nil, err return nil, err
} }
return &snap, nil return &snap, nil
@ -166,7 +166,7 @@ func checkSuffix(names []string) []string {
if strings.HasSuffix(names[i], snapSuffix) { if strings.HasSuffix(names[i], snapSuffix) {
snaps = append(snaps, names[i]) snaps = append(snaps, names[i])
} else { } else {
logger.Warningf("skipped unexpected non snapshot file %v", names[i]) plog.Warningf("skipped unexpected non snapshot file %v", names[i])
} }
} }
return snaps return snaps
@ -175,6 +175,6 @@ func checkSuffix(names []string) []string {
func renameBroken(path string) { func renameBroken(path string) {
brokenPath := path + ".broken" brokenPath := path + ".broken"
if err := os.Rename(path, brokenPath); err != nil { if err := os.Rename(path, brokenPath); err != nil {
logger.Warningf("cannot rename broken snapshot file %v to %v: %v", path, brokenPath, err) plog.Warningf("cannot rename broken snapshot file %v to %v: %v", path, brokenPath, err)
} }
} }

6
wal/util.go
View File

@ -42,7 +42,7 @@ func searchIndex(names []string, index uint64) (int, bool) {
name := names[i] name := names[i]
_, curIndex, err := parseWalName(name) _, curIndex, err := parseWalName(name)
if err != nil { if err != nil {
logger.Panicf("parse correct name should never fail: %v", err) plog.Panicf("parse correct name should never fail: %v", err)
} }
if index >= curIndex { if index >= curIndex {
return i, true return i, true
@ -58,7 +58,7 @@ func isValidSeq(names []string) bool {
for _, name := range names { for _, name := range names {
curSeq, _, err := parseWalName(name) curSeq, _, err := parseWalName(name)
if err != nil { if err != nil {
logger.Panicf("parse correct name should never fail: %v", err) plog.Panicf("parse correct name should never fail: %v", err)
} }
if lastSeq != 0 && lastSeq != curSeq-1 { if lastSeq != 0 && lastSeq != curSeq-1 {
return false return false
@ -72,7 +72,7 @@ func checkWalNames(names []string) []string {
wnames := make([]string, 0) wnames := make([]string, 0)
for _, name := range names { for _, name := range names {
if _, _, err := parseWalName(name); err != nil { if _, _, err := parseWalName(name); err != nil {
logger.Warningf("ignored file %v in wal", name) plog.Warningf("ignored file %v in wal", name)
continue continue
} }
wnames = append(wnames, name) wnames = append(wnames, name)

6
wal/wal.go
View File

@ -50,7 +50,7 @@ const (
) )
var ( var (
logger = capnslog.NewPackageLogger("github.com/coreos/etcd", "wal") plog = capnslog.NewPackageLogger("github.com/coreos/etcd", "wal")
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")
@ -175,7 +175,7 @@ func openAtIndex(dirpath string, snap walpb.Snapshot, all bool) (*WAL, error) {
if all { if all {
return nil, err return nil, err
} else { } else {
logger.Warningf("opened all the files until %s, since it is still in use by an etcd server", name) plog.Warningf("opened all the files until %s, since it is still in use by an etcd server", name)
break break
} }
} }
@ -356,7 +356,7 @@ func (w *WAL) cut() error {
// increase the wal seq // increase the wal seq
w.seq++ w.seq++
logger.Infof("segmented wal file %v is created", fpath) plog.Infof("segmented wal file %v is created", fpath)
return nil return nil
} }