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 #1781 from orls/fix-backup-snapshots

Browse Source 
Fix backup snapshots
This commit is contained in:
Xiang Li 2014-11-25 08:59:16 -08:00
commit aa2721e31d
1 changed files with 7 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
etcdctl/command/backup_command.go
View File

@ -19,6 +19,7 @@ package command
import ( import (
"log" "log"
"math/rand" "math/rand"
"os"
"path" "path"
"time" "time"
@ -49,6 +50,9 @@ func handleBackup(c *cli.Context) {
srcWAL := path.Join(c.String("data-dir"), "wal") srcWAL := path.Join(c.String("data-dir"), "wal")
destWAL := path.Join(c.String("backup-dir"), "wal") destWAL := path.Join(c.String("backup-dir"), "wal")
if err := os.MkdirAll(destSnap, 0700); err != nil {
log.Fatalf("failed creating backup snapshot dir %v: %v", destSnap, err)
}
ss := snap.New(srcSnap) ss := snap.New(srcSnap)
snapshot, err := ss.Load() snapshot, err := ss.Load()
if err != nil && err != snap.ErrNoSnapshot { if err != nil && err != snap.ErrNoSnapshot {
@ -58,7 +62,9 @@ func handleBackup(c *cli.Context) {
if snapshot != nil { if snapshot != nil {
index = snapshot.Index index = snapshot.Index
newss := snap.New(destSnap) newss := snap.New(destSnap)
newss.SaveSnap(*snapshot) if err := newss.SaveSnap(*snapshot); err != nil {
log.Fatal(err)
}
} }
w, err := wal.OpenAtIndex(srcWAL, index) w, err := wal.OpenAtIndex(srcWAL, index)