1 files changed, 45 insertions, 14 deletions

diff --git a/weed/server/master_grpc_server_cluster.go b/weed/server/master_grpc_server_cluster.go
index fea4a66aa..e68238caa 100644
--- a/weed/server/master_grpc_server_cluster.go
+++ b/weed/server/master_grpc_server_cluster.go
@@ -2,35 +2,48 @@ 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"
+	"github.com/seaweedfs/seaweedfs/weed/cluster"
+	"github.com/seaweedfs/seaweedfs/weed/pb"
+	"github.com/seaweedfs/seaweedfs/weed/pb/master_pb"
 	"math/rand"
 )
 
 func (ms *MasterServer) ListClusterNodes(ctx context.Context, req *master_pb.ListClusterNodesRequest) (*master_pb.ListClusterNodesResponse, error) {
 	resp := &master_pb.ListClusterNodesResponse{}
-	filerGroup := cluster.FilerGroup(req.FilerGroup)
-	clusterNodes := ms.Cluster.ListClusterNode(filerGroup, req.ClientType)
+	filerGroup := cluster.FilerGroupName(req.FilerGroup)
 
-	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, node.Address),
-			CreatedAtNs: node.CreatedTs.UnixNano(),
-		})
+	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),
+			})
+		}
 	}
 	return resp, nil
 }
 
-func (ms *MasterServer) GetOneFiler(filerGroup cluster.FilerGroup) pb.ServerAddress {
+func (ms *MasterServer) GetOneFiler(filerGroup cluster.FilerGroupName) pb.ServerAddress {
 
 	clusterNodes := ms.Cluster.ListClusterNode(filerGroup, cluster.FilerType)
 
 	var filers []pb.ServerAddress
 	for _, node := range clusterNodes {
-		if ms.Cluster.IsOneLeader(filerGroup, node.Address) {
+		if ms.Cluster.IsOneLeader(filerGroup, cluster.FilerType, node.Address) {
 			filers = append(filers, node.Address)
 		}
 	}
@@ -39,3 +52,21 @@ func (ms *MasterServer) GetOneFiler(filerGroup cluster.FilerGroup) pb.ServerAddr
 	}
 	return "localhost:8888"
 }
+
+func limitTo(nodes []*cluster.ClusterNode, limit int32) (selected []*cluster.ClusterNode) {
+	if limit <= 0 || len(nodes) < int(limit) {
+		return nodes
+	}
+	seletedSet := make(map[pb.ServerAddress]*cluster.ClusterNode)
+	for i := 0; i < int(limit)*3; i++ {
+		x := rand.Intn(len(nodes))
+		if _, found := seletedSet[nodes[x].Address]; found {
+			continue
+		}
+		seletedSet[nodes[x].Address] = nodes[x]
+	}
+	for _, node := range seletedSet {
+		selected = append(selected, node)
+	}
+	return
+}