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

master: remove hard coded filer settings in master.toml

Browse Source 
fix https://github.com/chrislusf/seaweedfs/issues/2529
This commit is contained in:
chrislu
2022-01-12 01:11:25 -08:00
parent cd1ad88f30
commit 826a7b307e
4 changed files with 28 additions and 17 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
weed/server/master_grpc_server_cluster.go
View File

@@ -2,7 +2,10 @@ package weed_server
import (
"context"
"github.com/chrislusf/seaweedfs/weed/cluster"
"github.com/chrislusf/seaweedfs/weed/pb"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"math/rand"
)
func (ms *MasterServer) ListClusterNodes(ctx context.Context, req *master_pb.ListClusterNodesRequest) (*master_pb.ListClusterNodesResponse, error) {
@@ -12,10 +15,26 @@ func (ms *MasterServer) ListClusterNodes(ctx context.Context, req *master_pb.Lis
for _, node := range clusterNodes {
resp.ClusterNodes = append(resp.ClusterNodes, &master_pb.ListClusterNodesResponse_ClusterNode{
Address: string(node.Address),
Version: node.Version,
Address: string(node.Address),
Version: node.Version,
IsLeader: ms.Cluster.IsOneLeader(node.Address),
})
}
return resp, nil
}
func (ms *MasterServer) GetOneFiler() pb.ServerAddress {
clusterNodes := ms.Cluster.ListClusterNode(cluster.FilerType)
var filers []pb.ServerAddress
for _, node := range clusterNodes {
if ms.Cluster.IsOneLeader(node.Address) {
filers = append(filers, node.Address)
}
}
if len(filers) > 0 {
return filers[rand.Intn(len(filers))]
}
return "localhost:8888"
}