diff options
| author | chrislu <chris.lu@gmail.com> | 2024-07-26 11:21:46 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-07-26 11:21:50 -0700 |
| commit | e2a07d11d5127edad63bdae12a8f911a29e729c1 (patch) | |
| tree | 380818560a04bc472faa2407e7cac11c65784761 | |
| parent | 0581ce60961acc9969b69c5560d3d0fc91598739 (diff) | |
| download | seaweedfs-e2a07d11d5127edad63bdae12a8f911a29e729c1.tar.xz seaweedfs-e2a07d11d5127edad63bdae12a8f911a29e729c1.zip | |
Revert "Check `ShouldGrowVolumes` before returning error in assign. (#5819)"
This reverts commit 98d66338d0333cd955f7840c64ef95e3c4807a17.
| -rw-r--r-- | weed/server/master_grpc_server_assign.go | 2 | ||||
| -rw-r--r-- | weed/server/master_server_handlers.go | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/weed/server/master_grpc_server_assign.go b/weed/server/master_grpc_server_assign.go index 999a919a6..efde9eacb 100644 --- a/weed/server/master_grpc_server_assign.go +++ b/weed/server/master_grpc_server_assign.go @@ -84,7 +84,7 @@ func (ms *MasterServer) Assign(ctx context.Context, req *master_pb.AssignRequest for time.Now().Sub(startTime) < maxTimeout { fid, count, dnList, shouldGrow, err := ms.Topo.PickForWrite(req.Count, option, vl) - if shouldGrow && !vl.HasGrowRequest() && vl.ShouldGrowVolumes(option) { + if shouldGrow && !vl.HasGrowRequest() { // if picked volume is almost full, trigger a volume-grow request if ms.Topo.AvailableSpaceFor(option) <= 0 { return nil, fmt.Errorf("no free volumes left for " + option.String()) diff --git a/weed/server/master_server_handlers.go b/weed/server/master_server_handlers.go index 665f5c967..f11883bfb 100644 --- a/weed/server/master_server_handlers.go +++ b/weed/server/master_server_handlers.go @@ -142,7 +142,7 @@ func (ms *MasterServer) dirAssignHandler(w http.ResponseWriter, r *http.Request) for time.Now().Sub(startTime) < maxTimeout { fid, count, dnList, shouldGrow, err := ms.Topo.PickForWrite(requestedCount, option, vl) - if shouldGrow && !vl.HasGrowRequest() && vl.ShouldGrowVolumes(option) { + if shouldGrow && !vl.HasGrowRequest() { // if picked volume is almost full, trigger a volume-grow request glog.V(0).Infof("dirAssign volume growth %v from %v", option.String(), r.RemoteAddr) if ms.Topo.AvailableSpaceFor(option) <= 0 { |