diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-10-05 01:58:30 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-10-05 01:58:30 -0700 |
| commit | 332d49432dfc5328b803ddbe540704d303500cfd (patch) | |
| tree | ef4a35b5cf4641f31d9f3f22d211a31587c837c2 /weed/server | |
| parent | 96119eab00e13ff056f3058b9032d12c3758cb35 (diff) | |
| download | seaweedfs-332d49432dfc5328b803ddbe540704d303500cfd.tar.xz seaweedfs-332d49432dfc5328b803ddbe540704d303500cfd.zip | |
reduce concurrent volume grow requests
Diffstat (limited to 'weed/server')
| -rw-r--r-- | weed/server/master_grpc_server_volume.go | 4 | ||||
| -rw-r--r-- | weed/server/master_server_handlers.go | 3 |
2 files changed, 5 insertions, 2 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), diff --git a/weed/server/master_server_handlers.go b/weed/server/master_server_handlers.go index 8187ca21f..50a3f12f6 100644 --- a/weed/server/master_server_handlers.go +++ b/weed/server/master_server_handlers.go @@ -115,13 +115,14 @@ func (ms *MasterServer) dirAssignHandler(w http.ResponseWriter, r *http.Request) vl := ms.Topo.GetVolumeLayout(option.Collection, option.ReplicaPlacement, option.Ttl, option.DiskType) - if vl.ShouldGrowVolumes(option) { + if !vl.HasGrowRequest() && vl.ShouldGrowVolumes(option) { glog.V(0).Infof("dirAssign volume growth %v from %v", option.String(), r.RemoteAddr) if ms.Topo.AvailableSpaceFor(option) <= 0 { writeJsonQuiet(w, r, http.StatusNotFound, operation.AssignResult{Error: "No free volumes left for " + option.String()}) return } errCh := make(chan error, 1) + vl.AddGrowRequest() ms.vgCh <- &topology.VolumeGrowRequest{ Option: option, Count: writableVolumeCount, |