collection list normal and ec volumes

3 files changed, 8 insertions, 5 deletions

diff --git a/weed/shell/command_collection_list.go b/weed/shell/command_collection_list.go
index 008a83e14..d1124adde 100644
--- a/weed/shell/command_collection_list.go
+++ b/weed/shell/command_collection_list.go
@@ -24,7 +24,7 @@ func (c *commandCollectionList) Help() string {
 
 func (c *commandCollectionList) Do(args []string, commandEnv *commandEnv, writer io.Writer) (err error) {
 
-	collections, err := ListCollectionNames(commandEnv)
+	collections, err := ListCollectionNames(commandEnv, true, true)
 
 	if err != nil {
 		return err
@@ -39,11 +39,14 @@ func (c *commandCollectionList) Do(args []string, commandEnv *commandEnv, writer
 	return nil
 }
 
-func ListCollectionNames(commandEnv *commandEnv) (collections []string, err error) {
+func ListCollectionNames(commandEnv *commandEnv, includeNormalVolumes, includeEcVolumes bool) (collections []string, err error) {
 	var resp *master_pb.CollectionListResponse
 	ctx := context.Background()
 	err = commandEnv.masterClient.WithClient(ctx, func(client master_pb.SeaweedClient) error {
-		resp, err = client.CollectionList(ctx, &master_pb.CollectionListRequest{})
+		resp, err = client.CollectionList(ctx, &master_pb.CollectionListRequest{
+			IncludeNormalVolumes: includeNormalVolumes,
+			IncludeEcVolumes:     includeEcVolumes,
+		})
 		return err
 	})
 	if err != nil {
diff --git a/weed/shell/command_ec_balance.go b/weed/shell/command_ec_balance.go
index b2e3ccaea..779d9ecd7 100644
--- a/weed/shell/command_ec_balance.go
+++ b/weed/shell/command_ec_balance.go
@@ -83,7 +83,7 @@ func (c *commandEcBalance) Do(args []string, commandEnv *commandEnv, writer io.W
 		}
 
 		if *collection == "EACH_COLLECTION" {
-			collections, err := ListCollectionNames(commandEnv)
+			collections, err := ListCollectionNames(commandEnv, false, true)
 			if err != nil {
 				return err
 			}
diff --git a/weed/shell/command_volume_balance.go b/weed/shell/command_volume_balance.go
index ed1e26d42..f440dc5d2 100644
--- a/weed/shell/command_volume_balance.go
+++ b/weed/shell/command_volume_balance.go
@@ -84,7 +84,7 @@ func (c *commandVolumeBalance) Do(args []string, commandEnv *commandEnv, writer
 			continue
 		}
 		if *collection == "EACH_COLLECTION" {
-			collections, err := ListCollectionNames(commandEnv)
+			collections, err := ListCollectionNames(commandEnv, true, false)
 			if err != nil {
 				return err
 			}