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

Merge pull request #14172 from SimFG/snap_log

Browse Source 
snap: Delete the nil judgment of the log object
This commit is contained in:
Piotr Tabor 2022-07-04 23:57:15 +02:00 committed by GitHub
commit 1749a07a20
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 22 additions and 40 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

62
server/etcdserver/api/snap/snapshotter.go
View File

@ -25,6 +25,7 @@ import (
"strings"
"time"
"go.etcd.io/etcd/client/pkg/v3/verify"
pioutil "go.etcd.io/etcd/pkg/v3/ioutil"
"go.etcd.io/etcd/pkg/v3/pbutil"
"go.etcd.io/etcd/raft/v3"
@ -129,29 +130,23 @@ func (s *Snapshotter) loadMatching(matchFn func(*raftpb.Snapshot) bool) (*raftpb
}
var snap *raftpb.Snapshot
for _, name := range names {
if snap, err = loadSnap(s.lg, s.dir, name); err == nil && matchFn(snap) {
if snap, err = s.loadSnap(name); err == nil && matchFn(snap) {
return snap, nil
}
}
return nil, ErrNoSnapshot
}
func loadSnap(lg *zap.Logger, dir, name string) (*raftpb.Snapshot, error) {
fpath := filepath.Join(dir, name)
snap, err := Read(lg, fpath)
func (s *Snapshotter) loadSnap(name string) (*raftpb.Snapshot, error) {
fpath := filepath.Join(s.dir, name)
snap, err := Read(s.lg, fpath)
if err != nil {
brokenPath := fpath + ".broken"
if lg != nil {
lg.Warn("failed to read a snap file", zap.String("path", fpath), zap.Error(err))
}
s.lg.Warn("failed to read a snap file", zap.String("path", fpath), zap.Error(err))
if rerr := os.Rename(fpath, brokenPath); rerr != nil {
if lg != nil {
lg.Warn("failed to rename a broken snap file", zap.String("path", fpath), zap.String("broken-path", brokenPath), zap.Error(rerr))
}
s.lg.Warn("failed to rename a broken snap file", zap.String("path", fpath), zap.String("broken-path", brokenPath), zap.Error(rerr))
} else {
if lg != nil {
lg.Warn("renamed to a broken snap file", zap.String("path", fpath), zap.String("broken-path", brokenPath))
}
s.lg.Warn("renamed to a broken snap file", zap.String("path", fpath), zap.String("broken-path", brokenPath))
}
}
return snap, err
@ -159,53 +154,42 @@ func loadSnap(lg *zap.Logger, dir, name string) (*raftpb.Snapshot, error) {
// Read reads the snapshot named by snapname and returns the snapshot.
func Read(lg *zap.Logger, snapname string) (*raftpb.Snapshot, error) {
verify.Assert(lg != nil, "the logger should not be nil")
b, err := os.ReadFile(snapname)
if err != nil {
if lg != nil {
lg.Warn("failed to read a snap file", zap.String("path", snapname), zap.Error(err))
}
lg.Warn("failed to read a snap file", zap.String("path", snapname), zap.Error(err))
return nil, err
}
if len(b) == 0 {
if lg != nil {
lg.Warn("failed to read empty snapshot file", zap.String("path", snapname))
}
lg.Warn("failed to read empty snapshot file", zap.String("path", snapname))
return nil, ErrEmptySnapshot
}
var serializedSnap snappb.Snapshot
if err = serializedSnap.Unmarshal(b); err != nil {
if lg != nil {
lg.Warn("failed to unmarshal snappb.Snapshot", zap.String("path", snapname), zap.Error(err))
}
lg.Warn("failed to unmarshal snappb.Snapshot", zap.String("path", snapname), zap.Error(err))
return nil, err
}
if len(serializedSnap.Data) == 0 || serializedSnap.Crc == 0 {
if lg != nil {
lg.Warn("failed to read empty snapshot data", zap.String("path", snapname))
}
lg.Warn("failed to read empty snapshot data", zap.String("path", snapname))
return nil, ErrEmptySnapshot
}
crc := crc32.Update(0, crcTable, serializedSnap.Data)
if crc != serializedSnap.Crc {
if lg != nil {
lg.Warn("snap file is corrupt",
zap.String("path", snapname),
zap.Uint32("prev-crc", serializedSnap.Crc),
zap.Uint32("new-crc", crc),
)
}
lg.Warn("snap file is corrupt",
zap.String("path", snapname),
zap.Uint32("prev-crc", serializedSnap.Crc),
zap.Uint32("new-crc", crc),
)
return nil, ErrCRCMismatch
}
var snap raftpb.Snapshot
if err = snap.Unmarshal(serializedSnap.Data); err != nil {
if lg != nil {
lg.Warn("failed to unmarshal raftpb.Snapshot", zap.String("path", snapname), zap.Error(err))
}
lg.Warn("failed to unmarshal raftpb.Snapshot", zap.String("path", snapname), zap.Error(err))
return nil, err
}
return &snap, nil
@ -227,7 +211,7 @@ func (s *Snapshotter) snapNames() ([]string, error) {
if err != nil {
return nil, err
}
snaps := checkSuffix(s.lg, filenames)
snaps := s.checkSuffix(filenames)
if len(snaps) == 0 {
return nil, ErrNoSnapshot
}
@ -235,7 +219,7 @@ func (s *Snapshotter) snapNames() ([]string, error) {
return snaps, nil
}
func checkSuffix(lg *zap.Logger, names []string) []string {
func (s *Snapshotter) checkSuffix(names []string) []string {
snaps := []string{}
for i := range names {
if strings.HasSuffix(names[i], snapSuffix) {
@ -244,9 +228,7 @@ func checkSuffix(lg *zap.Logger, names []string) []string {
// If we find a file which is not a snapshot then check if it's
// a valid file. If not throw out a warning.
if _, ok := validFiles[names[i]]; !ok {
if lg != nil {
lg.Warn("found unexpected non-snap file; skipping", zap.String("path", names[i]))
}
s.lg.Warn("found unexpected non-snap file; skipping", zap.String("path", names[i]))
}
}
}