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

snap: better naming

release-2.0
Xiang Li 2014-08-19 15:41:52 -07:00 committed by Yicheng Qin
parent 94521738a9
commit 12a9b84b2b
1 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
snap/snapshotter.go
View File

@ -61,8 +61,8 @@ func (s *Snapshotter) Load() (*raft.Snapshot, error) {
} }
sort.Sort(sort.Reverse(sort.StringSlice(names))) sort.Sort(sort.Reverse(sort.StringSlice(names)))
var snapshot raft.Snapshot var snap raft.Snapshot
var snap Snapshot var serializedSnap Snapshot
var b []byte var b []byte
for _, name := range names { for _, name := range names {
b, err = ioutil.ReadFile(path.Join(s.dir, name)) b, err = ioutil.ReadFile(path.Join(s.dir, name))
@ -70,17 +70,17 @@ func (s *Snapshotter) Load() (*raft.Snapshot, error) {
log.Printf("Snapshotter cannot read file %v: %v", name, err) log.Printf("Snapshotter cannot read file %v: %v", name, err)
continue continue
} }
if err = snap.Unmarshal(b); err != nil { if err = serializedSnap.Unmarshal(b); err != nil {
log.Printf("Corruptted snapshot file %v: %v", name, err) log.Printf("Corruptted snapshot file %v: %v", name, err)
continue continue
} }
crc := crc32.Update(0, crcTable, snap.Data) crc := crc32.Update(0, crcTable, serializedSnap.Data)
if crc != snap.Crc { if crc != serializedSnap.Crc {
log.Printf("Corruptted snapshot file %v: crc mismatch", name) log.Printf("Corruptted snapshot file %v: crc mismatch", name)
err = ErrCRCMismatch err = ErrCRCMismatch
continue continue
} }
if err = json.Unmarshal(snap.Data, &snapshot); err != nil { if err = json.Unmarshal(serializedSnap.Data, &snap); err != nil {
log.Printf("Corruptted snapshot file %v: %v", name, err) log.Printf("Corruptted snapshot file %v: %v", name, err)
} }
break break
@ -88,5 +88,5 @@ func (s *Snapshotter) Load() (*raft.Snapshot, error) {
if err != nil { if err != nil {
return nil, err return nil, err
} }
return &snapshot, nil return &snap, nil
} }