diff options
| author | chrislu <chris.lu@gmail.com> | 2024-01-23 19:41:16 -0800 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-01-23 19:41:16 -0800 |
| commit | a8ddbf9ed2cebe2cafc518a1e7269a94f8332106 (patch) | |
| tree | 6ed9327376067841b7bcef04293ec8ed4a738698 | |
| parent | 7c1ad109ef68b89cf10493dbaf62b43bfe17d2d6 (diff) | |
| parent | 49fcb48e04e3b366b1a1d8bcbbaf79788707aca2 (diff) | |
| download | seaweedfs-a8ddbf9ed2cebe2cafc518a1e7269a94f8332106.tar.xz seaweedfs-a8ddbf9ed2cebe2cafc518a1e7269a94f8332106.zip | |
Merge branch 'master' into mq-subscribe
| -rw-r--r-- | weed/server/master_grpc_server_volume.go | 5 | ||||
| -rw-r--r-- | weed/server/master_server_handlers.go | 7 | ||||
| -rw-r--r-- | weed/topology/volume_growth.go | 1 |
3 files changed, 0 insertions, 13 deletions
diff --git a/weed/server/master_grpc_server_volume.go b/weed/server/master_grpc_server_volume.go index ba18ce649..a344e5221 100644 --- a/weed/server/master_grpc_server_volume.go +++ b/weed/server/master_grpc_server_volume.go @@ -61,11 +61,6 @@ func (ms *MasterServer) ProcessGrowRequest() { } vl.DoneGrowRequest() - if req.ErrCh != nil { - req.ErrCh <- err - close(req.ErrCh) - } - filter.Delete(req) }() diff --git a/weed/server/master_server_handlers.go b/weed/server/master_server_handlers.go index ccfb2e0c7..c5e059f21 100644 --- a/weed/server/master_server_handlers.go +++ b/weed/server/master_server_handlers.go @@ -135,17 +135,10 @@ func (ms *MasterServer) dirAssignHandler(w http.ResponseWriter, r *http.Request) 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, - ErrCh: errCh, - } - if err := <-errCh; err != nil { - writeJsonError(w, r, http.StatusInternalServerError, fmt.Errorf("cannot grow volume group! %v", err)) - return } } if err != nil { diff --git a/weed/topology/volume_growth.go b/weed/topology/volume_growth.go index 0d8893605..cf5690cec 100644 --- a/weed/topology/volume_growth.go +++ b/weed/topology/volume_growth.go @@ -29,7 +29,6 @@ This package is created to resolve these replica placement issues: type VolumeGrowRequest struct { Option *VolumeGrowOption Count int - ErrCh chan error } type VolumeGrowOption struct { |