1 files changed, 57 insertions, 4 deletions
diff --git a/weed/shell/command_cluster_ps.go b/weed/shell/command_cluster_ps.go
index 72f477607..21d3587fb 100644
--- a/weed/shell/command_cluster_ps.go
+++ b/weed/shell/command_cluster_ps.go
@@ -5,6 +5,9 @@ import (
 	"flag"
 	"fmt"
 	"github.com/chrislusf/seaweedfs/weed/cluster"
+	"github.com/chrislusf/seaweedfs/weed/pb"
+	"github.com/chrislusf/seaweedfs/weed/pb/filer_pb"
+	"github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb"
 	"io"
 
 	"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
@@ -36,21 +39,71 @@ func (c *commandClusterPs) Do(args []string, commandEnv *CommandEnv, writer io.W
 		return nil
 	}
 
+	var filerNodes []*master_pb.ListClusterNodesResponse_ClusterNode
+
 	err = commandEnv.MasterClient.WithClient(false, func(client master_pb.SeaweedClient) error {
 		resp, err := client.ListClusterNodes(context.Background(), &master_pb.ListClusterNodesRequest{
 			ClientType: cluster.FilerType,
 			FilerGroup: *commandEnv.option.FilerGroup,
 		})
-
-		fmt.Fprintf(writer, "the cluster has %d filers\n", len(resp.ClusterNodes))
-		for _, node := range resp.ClusterNodes {
-			fmt.Fprintf(writer, "  * %s (%v)\n", node.Address, node.Version)
+		if err != nil {
+			return err
 		}
+
+		filerNodes = resp.ClusterNodes
 		return err
 	})
 	if err != nil {
 		return
 	}
 
+	fmt.Fprintf(writer, "* filers %d\n", len(filerNodes))
+	for _, node := range filerNodes {
+		fmt.Fprintf(writer, "  * %s (%v)\n", node.Address, node.Version)
+		pb.WithFilerClient(false, pb.ServerAddress(node.Address), commandEnv.option.GrpcDialOption, func(client filer_pb.SeaweedFilerClient) error {
+			resp, err := client.GetFilerConfiguration(context.Background(), &filer_pb.GetFilerConfigurationRequest{})
+			if err == nil {
+				if resp.FilerGroup != "" {
+					fmt.Fprintf(writer, "    filer group: %s\n", resp.FilerGroup)
+				}
+				fmt.Fprintf(writer, "    signature: %d\n", resp.Signature)
+			} else {
+				fmt.Fprintf(writer, "    failed to connect: %v\n", err)
+			}
+			return err
+		})
+	}
+
+	// collect volume servers
+	var volumeServers []pb.ServerAddress
+	t, _, err := collectTopologyInfo(commandEnv, 0)
+	if err != nil {
+		return err
+	}
+	for _, dc := range t.DataCenterInfos {
+		for _, r := range dc.RackInfos {
+			for _, dn := range r.DataNodeInfos {
+				volumeServers = append(volumeServers, pb.NewServerAddressFromDataNode(dn))
+			}
+		}
+	}
+
+	fmt.Fprintf(writer, "* volume servers %d\n", len(volumeServers))
+	for _, dc := range t.DataCenterInfos {
+		fmt.Fprintf(writer, "  * data center: %s\n", dc.Id)
+		for _, r := range dc.RackInfos {
+			fmt.Fprintf(writer, "    * rack: %s\n", r.Id)
+			for _, dn := range r.DataNodeInfos {
+				pb.WithVolumeServerClient(false, pb.NewServerAddressFromDataNode(dn), commandEnv.option.GrpcDialOption, func(client volume_server_pb.VolumeServerClient) error {
+					resp, err := client.VolumeServerStatus(context.Background(), &volume_server_pb.VolumeServerStatusRequest{})
+					if err == nil {
+						fmt.Fprintf(writer, "      * %s (%v)\n", dn.Id, resp.Version)
+					}
+					return err
+				})
+			}
+		}
+	}
+
 	return nil
 }