diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-02-16 11:06:13 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-02-16 11:06:13 -0800 |
| commit | 632c94d4389dbccd1e1e765036b3c9785d44e5d5 (patch) | |
| tree | 65a29307f4079f6b539e97c405d65809d898e170 /weed/command | |
| parent | b9b5b932c5892f14da6b489a6907ffd8649a3eb5 (diff) | |
| parent | 0611233f16ff0e8f4b99aa6528f47153efd9a846 (diff) | |
| download | seaweedfs-632c94d4389dbccd1e1e765036b3c9785d44e5d5.tar.xz seaweedfs-632c94d4389dbccd1e1e765036b3c9785d44e5d5.zip | |
Merge branch 'extend_to_disk_type'
Diffstat (limited to 'weed/command')
| -rw-r--r-- | weed/command/mount_std.go | 4 | ||||
| -rw-r--r-- | weed/command/volume.go | 5 |
2 files changed, 5 insertions, 4 deletions
diff --git a/weed/command/mount_std.go b/weed/command/mount_std.go index 56338e327..a6d562d40 100644 --- a/weed/command/mount_std.go +++ b/weed/command/mount_std.go @@ -5,7 +5,7 @@ package command import ( "context" "fmt" - "github.com/chrislusf/seaweedfs/weed/storage" + "github.com/chrislusf/seaweedfs/weed/storage/types" "os" "os/user" "path" @@ -169,7 +169,7 @@ func RunMount(option *MountOptions, umask os.FileMode) bool { mountRoot = mountRoot[0 : len(mountRoot)-1] } - diskType := storage.ToDiskType(*option.diskType) + diskType := types.ToDiskType(*option.diskType) seaweedFileSystem := filesys.NewSeaweedFileSystem(&filesys.Option{ MountDirectory: dir, diff --git a/weed/command/volume.go b/weed/command/volume.go index a85f9b6be..ff951afdc 100644 --- a/weed/command/volume.go +++ b/weed/command/volume.go @@ -2,6 +2,7 @@ package command import ( "fmt" + "github.com/chrislusf/seaweedfs/weed/storage/types" "net/http" httppprof "net/http/pprof" "os" @@ -170,10 +171,10 @@ func (v VolumeServerOptions) startVolumeServer(volumeFolders, maxVolumeCounts, v } // set disk types - var diskTypes []storage.DiskType + var diskTypes []types.DiskType diskTypeStrings := strings.Split(*v.diskType, ",") for _, diskTypeString := range diskTypeStrings { - diskTypes = append(diskTypes, storage.ToDiskType(diskTypeString)) + diskTypes = append(diskTypes, types.ToDiskType(diskTypeString)) } if len(diskTypes) == 1 && len(v.folders) > 1 { for i := 0; i < len(v.folders)-1; i++ { |