gsh-digital-services/seaweedFS
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

remove unused cluster node leader

Browse Source
This commit is contained in:
chrislu
2023-06-19 18:19:13 -07:00
parent f97e663f0d
commit 8ec1bc2c99
23 changed files with 718 additions and 1028 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
weed/server/master_grpc_server_cluster.go
View File

@@ -12,43 +12,26 @@ func (ms *MasterServer) ListClusterNodes(ctx context.Context, req *master_pb.Lis
resp := &master_pb.ListClusterNodesResponse{}
filerGroup := cluster.FilerGroupName(req.FilerGroup)
if req.IsLeaderOnly {
leaders := ms.Cluster.ListClusterNodeLeaders(filerGroup, req.ClientType)
for _, node := range leaders {
resp.ClusterNodes = append(resp.ClusterNodes, &master_pb.ListClusterNodesResponse_ClusterNode{
Address: string(node),
IsLeader: true,
})
}
} else {
clusterNodes := ms.Cluster.ListClusterNode(filerGroup, req.ClientType)
clusterNodes = limitTo(clusterNodes, req.Limit)
for _, node := range clusterNodes {
resp.ClusterNodes = append(resp.ClusterNodes, &master_pb.ListClusterNodesResponse_ClusterNode{
Address: string(node.Address),
Version: node.Version,
IsLeader: ms.Cluster.IsOneLeader(filerGroup, req.ClientType, node.Address),
CreatedAtNs: node.CreatedTs.UnixNano(),
DataCenter: string(node.DataCenter),
Rack: string(node.Rack),
})
}
clusterNodes := ms.Cluster.ListClusterNode(filerGroup, req.ClientType)
clusterNodes = limitTo(clusterNodes, req.Limit)
for _, node := range clusterNodes {
resp.ClusterNodes = append(resp.ClusterNodes, &master_pb.ListClusterNodesResponse_ClusterNode{
Address: string(node.Address),
Version: node.Version,
CreatedAtNs: node.CreatedTs.UnixNano(),
DataCenter: string(node.DataCenter),
Rack: string(node.Rack),
})
}
return resp, nil
}
func (ms *MasterServer) GetOneFiler(filerGroup cluster.FilerGroupName) pb.ServerAddress {
clusterNodes := ms.Cluster.ListClusterNode(filerGroup, cluster.FilerType)
filers := ms.Cluster.ListClusterNode(filerGroup, cluster.FilerType)
var filers []pb.ServerAddress
for _, node := range clusterNodes {
if ms.Cluster.IsOneLeader(filerGroup, cluster.FilerType, node.Address) {
filers = append(filers, node.Address)
}
}
if len(filers) > 0 {
return filers[rand.Intn(len(filers))]
return filers[rand.Intn(len(filers))].Address
}
return "localhost:8888"
}