diff options
| author | Konstantin Lebedev <9497591+kmlebedev@users.noreply.github.com> | 2024-07-12 23:19:08 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2024-07-12 11:19:08 -0700 |
| commit | 04f4b108842742a7b0205a02baed32d3bacbb73f (patch) | |
| tree | 2f2cac6863f70c9b0809c248fb0d980f0b5ccd61 /weed/server/master_server_handlers_admin.go | |
| parent | 3a82f5ffad3122a3adeb9e652cee72420a2f6f97 (diff) | |
| download | seaweedfs-04f4b108842742a7b0205a02baed32d3bacbb73f.tar.xz seaweedfs-04f4b108842742a7b0205a02baed32d3bacbb73f.zip | |
fix: avoid timeout if datacenter does not exist in topology (#5772)
* fix: avoid timeout if datacenter does not exist in topology
* fix: error msg
* fix: rm dublicate check
* fix: compare
* revert minor change
Diffstat (limited to 'weed/server/master_server_handlers_admin.go')
| -rw-r--r-- | weed/server/master_server_handlers_admin.go | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/weed/server/master_server_handlers_admin.go b/weed/server/master_server_handlers_admin.go index f40b819af..07c0a94d2 100644 --- a/weed/server/master_server_handlers_admin.go +++ b/weed/server/master_server_handlers_admin.go @@ -81,6 +81,8 @@ func (ms *MasterServer) volumeGrowHandler(w http.ResponseWriter, r *http.Request if count, err = strconv.Atoi(r.FormValue("count")); err == nil { if ms.Topo.AvailableSpaceFor(option) < int64(count*option.ReplicaPlacement.GetCopyCount()) { err = fmt.Errorf("only %d volumes left, not enough for %d", ms.Topo.AvailableSpaceFor(option), count*option.ReplicaPlacement.GetCopyCount()) + } else if !ms.Topo.DataCenterExists(option.DataCenter) { + err = fmt.Errorf("data center %v not found in topology", option.DataCenter) } else { var newVidLocations []*master_pb.VolumeLocation newVidLocations, err = ms.vg.GrowByCountAndType(ms.grpcDialOption, count, option, ms.Topo) |