From 5720fe812ebcc4f07697c69828a3ef820b2a0145 Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Wed, 22 Jun 2016 15:01:27 -0700 Subject: [PATCH] etcdctl: use CreateDirAll --- etcdctl/ctlv2/command/backup_command.go | 4 ++-- etcdctl/ctlv3/command/snapshot_command.go | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/etcdctl/ctlv2/command/backup_command.go b/etcdctl/ctlv2/command/backup_command.go index c83761a15..9c7e2ffbf 100644 --- a/etcdctl/ctlv2/command/backup_command.go +++ b/etcdctl/ctlv2/command/backup_command.go @@ -17,11 +17,11 @@ package command import ( "fmt" "log" - "os" "path" "time" "github.com/coreos/etcd/etcdserver/etcdserverpb" + "github.com/coreos/etcd/pkg/fileutil" "github.com/coreos/etcd/pkg/idutil" "github.com/coreos/etcd/pkg/pbutil" "github.com/coreos/etcd/snap" @@ -65,7 +65,7 @@ func handleBackup(c *cli.Context) error { destWAL = path.Join(c.String("backup-dir"), "member", "wal") } - if err := os.MkdirAll(destSnap, 0700); err != nil { + if err := fileutil.CreateDirAll(destSnap); err != nil { log.Fatalf("failed creating backup snapshot dir %v: %v", destSnap, err) } ss := snap.New(srcSnap) diff --git a/etcdctl/ctlv3/command/snapshot_command.go b/etcdctl/ctlv3/command/snapshot_command.go index 3dc73189b..56b6e1f97 100644 --- a/etcdctl/ctlv3/command/snapshot_command.go +++ b/etcdctl/ctlv3/command/snapshot_command.go @@ -200,7 +200,7 @@ func initialClusterFromName(name string) string { // makeWAL creates a WAL for the initial cluster func makeWAL(waldir string, cl *membership.RaftCluster) { - if err := os.MkdirAll(waldir, 0755); err != nil { + if err := fileutil.CreateDirAll(waldir); err != nil { ExitWithError(ExitIO, err) } @@ -277,7 +277,7 @@ func makeDB(snapdir, dbfile string) { ExitWithError(ExitIO, err) } - if err := os.MkdirAll(snapdir, 0755); err != nil { + if err := fileutil.CreateDirAll(snapdir); err != nil { ExitWithError(ExitIO, err) }