diff options
| author | Chris Lu <chris.lu@gmail.com> | 2021-11-02 23:38:45 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2021-11-02 23:38:45 -0700 |
| commit | 5160eb08f7665409221ebb0b9db6f4820e29bed3 (patch) | |
| tree | f63464dd23ee0742bd96afe52826b477a775dc5e /weed/server/master_grpc_server.go | |
| parent | 18bfbf62fcc64be380293ce797ab23f785c01760 (diff) | |
| download | seaweedfs-5160eb08f7665409221ebb0b9db6f4820e29bed3.tar.xz seaweedfs-5160eb08f7665409221ebb0b9db6f4820e29bed3.zip | |
shell: optionally read filer address from master
Diffstat (limited to 'weed/server/master_grpc_server.go')
| -rw-r--r-- | weed/server/master_grpc_server.go | 22 |
1 files changed, 6 insertions, 16 deletions
diff --git a/weed/server/master_grpc_server.go b/weed/server/master_grpc_server.go index c669adaa6..53e28c5bf 100644 --- a/weed/server/master_grpc_server.go +++ b/weed/server/master_grpc_server.go @@ -6,7 +6,6 @@ import ( "github.com/chrislusf/seaweedfs/weed/storage/backend" "github.com/chrislusf/seaweedfs/weed/util" "net" - "strings" "time" "github.com/chrislusf/raft" @@ -195,9 +194,13 @@ func (ms *MasterServer) KeepConnected(stream master_pb.Seaweed_KeepConnectedServ // buffer by 1 so we don't end up getting stuck writing to stopChan forever stopChan := make(chan bool, 1) - clientName, messageChan := ms.addClient(req.Name, peerAddress) + clientName, messageChan := ms.addClient(req.ClientType, peerAddress) + ms.Cluster.AddClusterNode(req.ClientType, peerAddress, req.Version) - defer ms.deleteClient(clientName) + defer func() { + ms.Cluster.RemoveClusterNode(req.ClientType, peerAddress) + ms.deleteClient(clientName) + }() for _, message := range ms.Topo.ToVolumeLocations() { if sendErr := stream.Send(message); sendErr != nil { @@ -295,19 +298,6 @@ func findClientAddress(ctx context.Context, grpcPort uint32) string { } -func (ms *MasterServer) ListMasterClients(ctx context.Context, req *master_pb.ListMasterClientsRequest) (*master_pb.ListMasterClientsResponse, error) { - resp := &master_pb.ListMasterClientsResponse{} - ms.clientChansLock.RLock() - defer ms.clientChansLock.RUnlock() - - for k := range ms.clientChans { - if strings.HasPrefix(k, req.ClientType+"@") { - resp.GrpcAddresses = append(resp.GrpcAddresses, k[len(req.ClientType)+1:]) - } - } - return resp, nil -} - func (ms *MasterServer) GetMasterConfiguration(ctx context.Context, req *master_pb.GetMasterConfigurationRequest) (*master_pb.GetMasterConfigurationResponse, error) { // tell the volume servers about the leader |