lsm/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2025-04-05 20:52:50 +08:00
Code Issues Actions Packages Projects Releases Wiki Activity

rename

Browse Source
This commit is contained in:
chrislu 2024-04-18 08:47:45 -07:00
parent 0bdf121e51
commit d9490c5e1f
4 changed files with 13 additions and 13 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
weed/server/master_grpc_server_assign.go
View File

@ -85,7 +85,7 @@ func (ms *MasterServer) Assign(ctx context.Context, req *master_pb.AssignRequest
return nil, fmt.Errorf("no free volumes left for " + option.String()) return nil, fmt.Errorf("no free volumes left for " + option.String())
} }
vl.AddGrowRequest() vl.AddGrowRequest()
ms.vgCh <- &topology.VolumeGrowRequest{ ms.volumeGrowthRequestChan <- &topology.VolumeGrowRequest{
Option: option, Option: option,
Count: int(req.WritableVolumeCount), Count: int(req.WritableVolumeCount),
} }

2
weed/server/master_grpc_server_volume.go
View File

@ -22,7 +22,7 @@ func (ms *MasterServer) ProcessGrowRequest() {
go func() { go func() {
filter := sync.Map{} filter := sync.Map{}
for { for {
req, ok := <-ms.vgCh req, ok := <-ms.volumeGrowthRequestChan
if !ok { if !ok {
break break
} }

20
weed/server/master_server.go
View File

@ -60,8 +60,8 @@ type MasterServer struct {
preallocateSize int64 preallocateSize int64
Topo *topology.Topology Topo *topology.Topology
vg *topology.VolumeGrowth vg *topology.VolumeGrowth
vgCh chan *topology.VolumeGrowRequest volumeGrowthRequestChan chan *topology.VolumeGrowRequest
boundedLeaderChan chan int boundedLeaderChan chan int
@ -105,14 +105,14 @@ func NewMasterServer(r *mux.Router, option *MasterOption, peers map[string]pb.Se
grpcDialOption := security.LoadClientTLS(v, "grpc.master") grpcDialOption := security.LoadClientTLS(v, "grpc.master")
ms := &MasterServer{ ms := &MasterServer{
option: option, option: option,
preallocateSize: preallocateSize, preallocateSize: preallocateSize,
vgCh: make(chan *topology.VolumeGrowRequest, 1<<6), volumeGrowthRequestChan: make(chan *topology.VolumeGrowRequest, 1<<6),
clientChans: make(map[string]chan *master_pb.KeepConnectedResponse), clientChans: make(map[string]chan *master_pb.KeepConnectedResponse),
grpcDialOption: grpcDialOption, grpcDialOption: grpcDialOption,
MasterClient: wdclient.NewMasterClient(grpcDialOption, "", cluster.MasterType, option.Master, "", "", *pb.NewServiceDiscoveryFromMap(peers)), MasterClient: wdclient.NewMasterClient(grpcDialOption, "", cluster.MasterType, option.Master, "", "", *pb.NewServiceDiscoveryFromMap(peers)),
adminLocks: NewAdminLocks(), adminLocks: NewAdminLocks(),
Cluster: cluster.NewCluster(), Cluster: cluster.NewCluster(),
} }
ms.boundedLeaderChan = make(chan int, 16) ms.boundedLeaderChan = make(chan int, 16)

2
weed/server/master_server_handlers.go
View File

@ -136,7 +136,7 @@ func (ms *MasterServer) dirAssignHandler(w http.ResponseWriter, r *http.Request)
return return
} }
vl.AddGrowRequest() vl.AddGrowRequest()
ms.vgCh <- &topology.VolumeGrowRequest{ ms.volumeGrowthRequestChan <- &topology.VolumeGrowRequest{
Option: option, Option: option,
Count: writableVolumeCount, Count: writableVolumeCount,
} }