diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-08-06 20:27:12 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-08-06 20:27:12 -0700 |
| commit | 679f800caafff8b31c645755d4316da543f5e99d (patch) | |
| tree | d0cce2379a5d335d2b30fcffd3786493cae364e7 | |
| parent | 286e5dd37525787b0610c41a2bb18a947a429d7d (diff) | |
| parent | 0c0f77e2ae45e1f905d33bf9cf129667665121ab (diff) | |
| download | seaweedfs-679f800caafff8b31c645755d4316da543f5e99d.tar.xz seaweedfs-679f800caafff8b31c645755d4316da543f5e99d.zip | |
Merge branch 'master' into add_remote_storage
| -rw-r--r-- | weed/filer/filer.go | 2 | ||||
| -rw-r--r-- | weed/shell/command_fs_mkdir.go | 3 | ||||
| -rw-r--r-- | weed/shell/command_volume_tier_move.go | 5 |
3 files changed, 8 insertions, 2 deletions
diff --git a/weed/filer/filer.go b/weed/filer/filer.go index 162db175a..1a20abefc 100644 --- a/weed/filer/filer.go +++ b/weed/filer/filer.go @@ -209,7 +209,7 @@ func (f *Filer) ensureParentDirecotryEntry(ctx context.Context, entry *Entry, di Attr: Attr{ Mtime: now, Crtime: now, - Mode: os.ModeDir | entry.Mode | 0110, + Mode: os.ModeDir | entry.Mode | 0111, Uid: entry.Uid, Gid: entry.Gid, Collection: entry.Collection, diff --git a/weed/shell/command_fs_mkdir.go b/weed/shell/command_fs_mkdir.go index 71a9daece..11b663eec 100644 --- a/weed/shell/command_fs_mkdir.go +++ b/weed/shell/command_fs_mkdir.go @@ -6,6 +6,7 @@ import ( "github.com/chrislusf/seaweedfs/weed/util" "io" "os" + "time" ) func init() { @@ -43,6 +44,8 @@ func (c *commandFsMkdir) Do(args []string, commandEnv *CommandEnv, writer io.Wri Name: name, IsDirectory: true, Attributes: &filer_pb.FuseAttributes{ + Mtime: time.Now().Unix(), + Crtime: time.Now().Unix(), FileMode: uint32(0777 | os.ModeDir), }, }, diff --git a/weed/shell/command_volume_tier_move.go b/weed/shell/command_volume_tier_move.go index 9e38c936d..19a515dab 100644 --- a/weed/shell/command_volume_tier_move.go +++ b/weed/shell/command_volume_tier_move.go @@ -8,6 +8,7 @@ import ( "github.com/chrislusf/seaweedfs/weed/wdclient" "io" "path/filepath" + "strings" "time" "github.com/chrislusf/seaweedfs/weed/storage/needle" @@ -136,7 +137,9 @@ func doVolumeTierMove(commandEnv *CommandEnv, writer io.Writer, vid needle.Volum for _, loc := range locations { if loc.Url != dst.dataNode.Id { if err = deleteVolume(commandEnv.option.GrpcDialOption, vid, loc.Url); err != nil { - fmt.Fprintf(writer, "failed to delete volume %d on %s\n", vid, loc.Url) + if !strings.Contains(err.Error(), "not found") { + fmt.Fprintf(writer, "failed to delete volume %d on %s: %v\n", vid, loc.Url, err) + } } } } |