diff options
| author | Chris Lu <chris.lu@gmail.com> | 2019-04-04 19:27:00 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2019-04-04 19:27:00 -0700 |
| commit | 766396d249652c1b29771fa1fce65250f9707d1d (patch) | |
| tree | aa1036504df20a663d58077836b6a39f797892b3 /weed/server/master_server_handlers_admin.go | |
| parent | 715a38da1e4fce05631f230ccf09ce92c99a4fd4 (diff) | |
| download | seaweedfs-766396d249652c1b29771fa1fce65250f9707d1d.tar.xz seaweedfs-766396d249652c1b29771fa1fce65250f9707d1d.zip | |
weed master: atomic volume counting
possible fix for https://github.com/chrislusf/seaweedfs/issues/913
Diffstat (limited to 'weed/server/master_server_handlers_admin.go')
| -rw-r--r-- | weed/server/master_server_handlers_admin.go | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/weed/server/master_server_handlers_admin.go b/weed/server/master_server_handlers_admin.go index 95e55a497..4f0195084 100644 --- a/weed/server/master_server_handlers_admin.go +++ b/weed/server/master_server_handlers_admin.go @@ -68,8 +68,8 @@ func (ms *MasterServer) volumeGrowHandler(w http.ResponseWriter, r *http.Request } if err == nil { if count, err = strconv.Atoi(r.FormValue("count")); err == nil { - if ms.Topo.FreeSpace() < count*option.ReplicaPlacement.GetCopyCount() { - err = errors.New("Only " + strconv.Itoa(ms.Topo.FreeSpace()) + " volumes left! Not enough for " + strconv.Itoa(count*option.ReplicaPlacement.GetCopyCount())) + 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()) } else { count, err = ms.vg.GrowByCountAndType(ms.grpcDialOpiton, count, option, ms.Topo) } |