aboutsummaryrefslogtreecommitdiff
path: root/weed/server/master_grpc_server_volume.go
diff options
context:
space:
mode:
authorChris Lu <chris.lu@gmail.com>2021-10-05 01:58:30 -0700
committerChris Lu <chris.lu@gmail.com>2021-10-05 01:58:30 -0700
commit332d49432dfc5328b803ddbe540704d303500cfd (patch)
treeef4a35b5cf4641f31d9f3f22d211a31587c837c2 /weed/server/master_grpc_server_volume.go
parent96119eab00e13ff056f3058b9032d12c3758cb35 (diff)
downloadseaweedfs-332d49432dfc5328b803ddbe540704d303500cfd.tar.xz
seaweedfs-332d49432dfc5328b803ddbe540704d303500cfd.zip
reduce concurrent volume grow requests
Diffstat (limited to 'weed/server/master_grpc_server_volume.go')
-rw-r--r--weed/server/master_grpc_server_volume.go4
1 files changed, 3 insertions, 1 deletions
diff --git a/weed/server/master_grpc_server_volume.go b/weed/server/master_grpc_server_volume.go
index 95fdc3fd1..551e59990 100644
--- a/weed/server/master_grpc_server_volume.go
+++ b/weed/server/master_grpc_server_volume.go
@@ -54,6 +54,7 @@ func (ms *MasterServer) ProcessGrowRequest() {
start := time.Now()
_, err := ms.vg.AutomaticGrowByType(req.Option, ms.grpcDialOption, ms.Topo, req.Count)
glog.V(1).Infoln("finished automatic volume grow, cost ", time.Now().Sub(start))
+ vl.DoneGrowRequest()
if req.ErrCh != nil {
req.ErrCh <- err
@@ -135,10 +136,11 @@ func (ms *MasterServer) Assign(ctx context.Context, req *master_pb.AssignRequest
vl := ms.Topo.GetVolumeLayout(option.Collection, option.ReplicaPlacement, option.Ttl, option.DiskType)
- if vl.ShouldGrowVolumes(option) {
+ if !vl.HasGrowRequest() && vl.ShouldGrowVolumes(option) {
if ms.Topo.AvailableSpaceFor(option) <= 0 {
return nil, fmt.Errorf("no free volumes left for " + option.String())
}
+ vl.AddGrowRequest()
ms.vgCh <- &topology.VolumeGrowRequest{
Option: option,
Count: int(req.WritableVolumeCount),