diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-02-13 13:50:14 -0800 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-02-13 13:50:14 -0800 |
| commit | 4bd8a692d80801f3864cf9ce4325908529a0f6ef (patch) | |
| tree | 14ecca5d79494628a41e8cf304aa395bb47948fe /weed/server | |
| parent | 712b3e9e53e116f58399fe30cd7038b234a5832b (diff) | |
| download | seaweedfs-4bd8a692d80801f3864cf9ce4325908529a0f6ef.tar.xz seaweedfs-4bd8a692d80801f3864cf9ce4325908529a0f6ef.zip | |
disk type can be generic tags
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/master_grpc_server_volume.go | 5 | ||||
| -rw-r--r-- | weed/server/master_server_handlers_admin.go | 5 |
2 files changed, 2 insertions, 8 deletions
diff --git a/weed/server/master_grpc_server_volume.go b/weed/server/master_grpc_server_volume.go index f1d65896a..deac3027c 100644 --- a/weed/server/master_grpc_server_volume.go +++ b/weed/server/master_grpc_server_volume.go @@ -61,10 +61,7 @@ func (ms *MasterServer) Assign(ctx context.Context, req *master_pb.AssignRequest if err != nil { return nil, err } - diskType, err := storage.ToDiskType(req.DiskType) - if err != nil { - return nil, err - } + diskType := storage.ToDiskType(req.DiskType) option := &topology.VolumeGrowOption{ Collection: req.Collection, diff --git a/weed/server/master_server_handlers_admin.go b/weed/server/master_server_handlers_admin.go index 7b1ec1f87..28737324c 100644 --- a/weed/server/master_server_handlers_admin.go +++ b/weed/server/master_server_handlers_admin.go @@ -158,10 +158,7 @@ func (ms *MasterServer) getVolumeGrowOption(r *http.Request) (*topology.VolumeGr if err != nil { return nil, err } - diskType, err := storage.ToDiskType(r.FormValue("disk")) - if err != nil { - return nil, err - } + diskType := storage.ToDiskType(r.FormValue("disk")) preallocate := ms.preallocateSize if r.FormValue("preallocate") != "" { |
