summaryrefslogtreecommitdiff
path: root/vendor/github.com/moby/swarmkit/v2/manager/state/raft/storage/snapwrap.go
diff options
context:
space:
mode:
Diffstat (limited to 'vendor/github.com/moby/swarmkit/v2/manager/state/raft/storage/snapwrap.go')
-rw-r--r--vendor/github.com/moby/swarmkit/v2/manager/state/raft/storage/snapwrap.go9
1 files changed, 3 insertions, 6 deletions
diff --git a/vendor/github.com/moby/swarmkit/v2/manager/state/raft/storage/snapwrap.go b/vendor/github.com/moby/swarmkit/v2/manager/state/raft/storage/snapwrap.go
index 02f9afea7f..7ae6d595ca 100644
--- a/vendor/github.com/moby/swarmkit/v2/manager/state/raft/storage/snapwrap.go
+++ b/vendor/github.com/moby/swarmkit/v2/manager/state/raft/storage/snapwrap.go
@@ -8,7 +8,6 @@ import (
"github.com/moby/swarmkit/v2/manager/encryption"
"github.com/pkg/errors"
- "go.etcd.io/etcd/client/pkg/v3/fileutil"
"go.etcd.io/etcd/raft/v3/raftpb"
"go.etcd.io/etcd/server/v3/etcdserver/api/snap"
)
@@ -118,12 +117,10 @@ func MigrateSnapshot(oldDir, newDir string, oldFactory, newFactory SnapFactory)
}
tmpdirpath := filepath.Clean(newDir) + ".tmp"
- if fileutil.Exist(tmpdirpath) {
- if err := os.RemoveAll(tmpdirpath); err != nil {
- return errors.Wrap(err, "could not remove temporary snapshot directory")
- }
+ if err := os.RemoveAll(tmpdirpath); err != nil {
+ return errors.Wrap(err, "could not remove temporary snapshot directory")
}
- if err := fileutil.CreateDirAll(tmpdirpath); err != nil {
+ if err := os.MkdirAll(tmpdirpath, 0o700); err != nil {
return errors.Wrap(err, "could not create temporary snapshot directory")
}
tmpSnapshotter := newFactory.New(tmpdirpath)