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 #4539 from xiang90/snap

Browse Source 
*: record the number of bytes of snapshot sent/received
This commit is contained in:
Gyu-Ho Lee 2016-02-16 16:39:22 -08:00
commit 976236b083
2 changed files with 9 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
etcdserver/snapshot_merge.go
View File

@ -60,7 +60,10 @@ func (s *EtcdServer) createMergedSnapshotMessage(m raftpb.Message, snapi uint64,
func newSnapshotReaderCloser(snapshot backend.Snapshot) io.ReadCloser { func newSnapshotReaderCloser(snapshot backend.Snapshot) io.ReadCloser {
pr, pw := io.Pipe() pr, pw := io.Pipe()
go func() { go func() {
_, err := snapshot.WriteTo(pw) n, err := snapshot.WriteTo(pw)
if err == nil {
plog.Infof("wrote database snapshot out [total bytes: %d]", n)
}
pw.CloseWithError(err) pw.CloseWithError(err)
snapshot.Close() snapshot.Close()
}() }()

6
snap/db.go
View File

@ -31,7 +31,8 @@ func (s *Snapshotter) SaveDBFrom(r io.Reader, id uint64) error {
if err != nil { if err != nil {
return err return err
} }
_, err = io.Copy(f, r) var n int64
n, err = io.Copy(f, r)
if err == nil { if err == nil {
err = f.Sync() err = f.Sync()
} }
@ -50,6 +51,9 @@ func (s *Snapshotter) SaveDBFrom(r io.Reader, id uint64) error {
os.Remove(f.Name()) os.Remove(f.Name())
return err return err
} }
plog.Infof("saved database snapshot to disk [total bytes: %d]", n)
return nil return nil
} }