Browse Source

Merge branch 'master' into add_remote_storage

pull/2241/head
Chris Lu 3 years ago
parent
commit
679f800caa
  1. 2
      weed/filer/filer.go
  2. 3
      weed/shell/command_fs_mkdir.go
  3. 5
      weed/shell/command_volume_tier_move.go

2
weed/filer/filer.go

@ -209,7 +209,7 @@ func (f *Filer) ensureParentDirecotryEntry(ctx context.Context, entry *Entry, di
Attr: Attr{ Attr: Attr{
Mtime: now, Mtime: now,
Crtime: now, Crtime: now,
Mode: os.ModeDir | entry.Mode | 0110,
Mode: os.ModeDir | entry.Mode | 0111,
Uid: entry.Uid, Uid: entry.Uid,
Gid: entry.Gid, Gid: entry.Gid,
Collection: entry.Collection, Collection: entry.Collection,

3
weed/shell/command_fs_mkdir.go

@ -6,6 +6,7 @@ import (
"github.com/chrislusf/seaweedfs/weed/util" "github.com/chrislusf/seaweedfs/weed/util"
"io" "io"
"os" "os"
"time"
) )
func init() { func init() {
@ -43,6 +44,8 @@ func (c *commandFsMkdir) Do(args []string, commandEnv *CommandEnv, writer io.Wri
Name: name, Name: name,
IsDirectory: true, IsDirectory: true,
Attributes: &filer_pb.FuseAttributes{ Attributes: &filer_pb.FuseAttributes{
Mtime: time.Now().Unix(),
Crtime: time.Now().Unix(),
FileMode: uint32(0777 | os.ModeDir), FileMode: uint32(0777 | os.ModeDir),
}, },
}, },

5
weed/shell/command_volume_tier_move.go

@ -8,6 +8,7 @@ import (
"github.com/chrislusf/seaweedfs/weed/wdclient" "github.com/chrislusf/seaweedfs/weed/wdclient"
"io" "io"
"path/filepath" "path/filepath"
"strings"
"time" "time"
"github.com/chrislusf/seaweedfs/weed/storage/needle" "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 { for _, loc := range locations {
if loc.Url != dst.dataNode.Id { if loc.Url != dst.dataNode.Id {
if err = deleteVolume(commandEnv.option.GrpcDialOption, vid, loc.Url); err != nil { 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)
}
} }
} }
} }

Loading…
Cancel
Save