gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

fix unreachable code

Browse source
This commit is contained in:
Chris Lu 2019-10-21 22:36:41 -07:00
parent c262526d8a
commit d16c450682
1 changed files with 8 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
weed/server/master_server_handlers_admin.go
View file

@ -2,7 +2,6 @@ package weed_server
import (
"context"
"errors"
"fmt"
"math/rand"
"net/http"
@ -68,7 +67,7 @@ func (ms *MasterServer) volumeGrowHandler(w http.ResponseWriter, r *http.Request
writeJsonError(w, r, http.StatusNotAcceptable, err)
return
}
if err == nil {
if count, err = strconv.Atoi(r.FormValue("count")); err == nil {
if ms.Topo.FreeSpace() < int64(count*option.ReplicaPlacement.GetCopyCount()) {
err = fmt.Errorf("only %d volumes left, not enough for %d", ms.Topo.FreeSpace(), count*option.ReplicaPlacement.GetCopyCount())
@ -76,9 +75,9 @@ func (ms *MasterServer) volumeGrowHandler(w http.ResponseWriter, r *http.Request
count, err = ms.vg.GrowByCountAndType(ms.grpcDialOpiton, count, option, ms.Topo)
}
} else {
err = errors.New("parameter count is not found")
}
err = fmt.Errorf("can not parse parameter count %s", r.FormValue("count"))
}
if err != nil {
writeJsonError(w, r, http.StatusNotAcceptable, err)
} else {