gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

collection list normal and ec volumes

Browse source
This commit is contained in:
Chris Lu 2019-05-30 09:27:23 -07:00
parent e941d0c2f4
commit 1d111d6ce8
7 changed files with 143 additions and 117 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
weed/pb/master.proto
View file

@ -167,6 +167,8 @@ message Collection {
string name = 1;
}
message CollectionListRequest {
bool include_normal_volumes = 1;
bool include_ec_volumes = 2;
}
message CollectionListResponse {
repeated Collection collections = 1;

231
weed/pb/master_pb/master.pb.go
View file

@ -846,6 +846,8 @@ func (m *Collection) GetName() string {
}
type CollectionListRequest struct {
IncludeNormalVolumes bool `protobuf:"varint,1,opt,name=include_normal_volumes,json=includeNormalVolumes" json:"include_normal_volumes,omitempty"`
IncludeEcVolumes bool `protobuf:"varint,2,opt,name=include_ec_volumes,json=includeEcVolumes" json:"include_ec_volumes,omitempty"`
}
func (m *CollectionListRequest) Reset() { *m = CollectionListRequest{} }
@ -853,6 +855,20 @@ func (m *CollectionListRequest) String() string { return proto.Compac
func (*CollectionListRequest) ProtoMessage() {}
func (*CollectionListRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{18} }
func (m *CollectionListRequest) GetIncludeNormalVolumes() bool {
if m != nil {
return m.IncludeNormalVolumes
}
return false
}
func (m *CollectionListRequest) GetIncludeEcVolumes() bool {
if m != nil {
return m.IncludeEcVolumes
}
return false
}
type CollectionListResponse struct {
Collections []*Collection `protobuf:"bytes,1,rep,name=collections" json:"collections,omitempty"`
}
@ -1668,110 +1684,113 @@ var _Seaweed_serviceDesc = grpc.ServiceDesc{
func init() { proto.RegisterFile("master.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{
// 1677 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x58, 0x4b, 0x6f, 0xdb, 0xca,
0x15, 0x36, 0xf5, 0xd6, 0xd1, 0xc3, 0xd2, 0xd8, 0x49, 0x14, 0xa5, 0x49, 0x14, 0x66, 0xa3, 0xa4,
0xad, 0x9b, 0x3a, 0x05, 0xba, 0x68, 0x8b, 0x20, 0x71, 0x9c, 0xd6, 0x88, 0x93, 0x38, 0x54, 0x92,
0x02, 0x05, 0x0a, 0x76, 0x44, 0x8e, 0x1d, 0xc2, 0x14, 0xc9, 0x72, 0x46, 0x8e, 0x95, 0x4d, 0x17,
0xed, 0xba, 0x9b, 0xfe, 0x89, 0xfe, 0x88, 0xa2, 0x9b, 0x2e, 0xfb, 0x2b, 0xba, 0xe8, 0xfa, 0x02,
0x77, 0x7b, 0x71, 0x81, 0x8b, 0x79, 0x90, 0x1c, 0x52, 0xb2, 0x1d, 0x07, 0xc8, 0x22, 0xbb, 0xe1,
0x99, 0x33, 0x67, 0xce, 0x7c, 0x73, 0x1e, 0xdf, 0x10, 0xda, 0x33, 0x4c, 0x19, 0x89, 0xb7, 0xa2,
0x38, 0x64, 0x21, 0x6a, 0xca, 0x2f, 0x3b, 0x9a, 0x9a, 0xff, 0xaa, 0x42, 0xf3, 0x77, 0x04, 0xc7,
0x6c, 0x4a, 0x30, 0x43, 0x5d, 0x28, 0x79, 0xd1, 0xc0, 0x18, 0x19, 0xe3, 0xa6, 0x55, 0xf2, 0x22,
0x84, 0xa0, 0x12, 0x85, 0x31, 0x1b, 0x94, 0x46, 0xc6, 0xb8, 0x63, 0x89, 0x31, 0xba, 0x09, 0x10,
0xcd, 0xa7, 0xbe, 0xe7, 0xd8, 0xf3, 0xd8, 0x1f, 0x94, 0x85, 0x6e, 0x53, 0x4a, 0xde, 0xc6, 0x3e,
0x1a, 0x43, 0x6f, 0x86, 0x4f, 0xed, 0x93, 0xd0, 0x9f, 0xcf, 0x88, 0xed, 0x84, 0xf3, 0x80, 0x0d,
0x2a, 0x62, 0x79, 0x77, 0x86, 0x4f, 0xdf, 0x09, 0xf1, 0x0e, 0x97, 0xa2, 0x11, 0xf7, 0xea, 0xd4,
0x3e, 0xf4, 0x7c, 0x62, 0x1f, 0x93, 0xc5, 0xa0, 0x3a, 0x32, 0xc6, 0x15, 0x0b, 0x66, 0xf8, 0xf4,
0x99, 0xe7, 0x93, 0xe7, 0x64, 0x81, 0x6e, 0x43, 0xcb, 0xc5, 0x0c, 0xdb, 0x0e, 0x09, 0x18, 0x89,
0x07, 0x35, 0xb1, 0x17, 0x70, 0xd1, 0x8e, 0x90, 0x70, 0xff, 0x62, 0xec, 0x1c, 0x0f, 0xea, 0x62,
0x46, 0x8c, 0xb9, 0x7f, 0xd8, 0x9d, 0x79, 0x81, 0x2d, 0x3c, 0x6f, 0x88, 0xad, 0x9b, 0x42, 0x72,
0xc0, 0xdd, 0xff, 0x0d, 0xd4, 0xa5, 0x6f, 0x74, 0xd0, 0x1c, 0x95, 0xc7, 0xad, 0xed, 0xbb, 0x5b,
0x29, 0x1a, 0x5b, 0xd2, 0xbd, 0xbd, 0xe0, 0x30, 0x8c, 0x67, 0x98, 0x79, 0x61, 0xf0, 0x82, 0x50,
0x8a, 0x8f, 0x88, 0x95, 0xac, 0x41, 0x7b, 0xd0, 0x0a, 0xc8, 0x07, 0x3b, 0x31, 0x01, 0xc2, 0xc4,
0x78, 0xc9, 0xc4, 0xe4, 0x7d, 0x18, 0xb3, 0x15, 0x76, 0x20, 0x20, 0x1f, 0xde, 0x29, 0x53, 0xaf,
0x61, 0xdd, 0x25, 0x3e, 0x61, 0xc4, 0x4d, 0xcd, 0xb5, 0x2e, 0x69, 0xae, 0xab, 0x0c, 0x24, 0x26,
0x7f, 0x0b, 0x4d, 0xe2, 0xd8, 0xf4, 0x3d, 0x8e, 0x5d, 0x3a, 0xe8, 0x09, 0x63, 0xf7, 0x97, 0x8c,
0xed, 0x3a, 0x13, 0xae, 0xb0, 0xc2, 0x5c, 0x83, 0xc8, 0x29, 0x8a, 0x5e, 0x42, 0x87, 0x1f, 0x33,
0x33, 0xd6, 0xbf, 0xb4, 0x31, 0x8e, 0xd3, 0x6e, 0x62, 0xef, 0x1d, 0xf4, 0x93, 0xb3, 0x66, 0x36,
0xd1, 0xa5, 0x6d, 0x26, 0x80, 0x25, 0x76, 0xcd, 0xb7, 0xd0, 0x4f, 0xa3, 0xd7, 0x22, 0x34, 0x0a,
0x03, 0x4a, 0xd0, 0x18, 0xd6, 0x25, 0xa0, 0x13, 0xef, 0x23, 0xd9, 0xf7, 0x66, 0x1e, 0x13, 0x21,
0x5d, 0xb1, 0x8a, 0x62, 0x74, 0x15, 0x6a, 0x3e, 0xc1, 0x2e, 0x89, 0x55, 0x1c, 0xab, 0x2f, 0xf3,
0x9b, 0x12, 0x0c, 0xce, 0x8a, 0x05, 0x91, 0x24, 0xae, 0xb0, 0xd8, 0xb1, 0x4a, 0x9e, 0xcb, 0x83,
0x90, 0x7a, 0x1f, 0x89, 0x48, 0x92, 0x8a, 0x25, 0xc6, 0xe8, 0x16, 0x80, 0x13, 0xfa, 0x3e, 0x71,
0xf8, 0x42, 0x65, 0x5c, 0x93, 0xf0, 0x20, 0x15, 0x71, 0x9f, 0xe5, 0x47, 0xc5, 0x6a, 0x72, 0x89,
0x4c, 0x8d, 0x3b, 0xd0, 0x96, 0x27, 0x55, 0x0a, 0x32, 0x35, 0x5a, 0x52, 0x26, 0x55, 0x7e, 0x02,
0x28, 0x41, 0x74, 0xba, 0x48, 0x15, 0x6b, 0x42, 0xb1, 0xa7, 0x66, 0x9e, 0x2c, 0x12, 0xed, 0x1b,
0xd0, 0x8c, 0x09, 0x76, 0xed, 0x30, 0xf0, 0x17, 0x22, 0x5b, 0x1a, 0x56, 0x83, 0x0b, 0x5e, 0x05,
0xfe, 0x02, 0xfd, 0x18, 0xfa, 0x31, 0x89, 0x7c, 0xcf, 0xc1, 0x76, 0xe4, 0x63, 0x87, 0xcc, 0x48,
0x90, 0x24, 0x4e, 0x4f, 0x4d, 0x1c, 0x24, 0x72, 0x34, 0x80, 0xfa, 0x09, 0x89, 0x29, 0x3f, 0x56,
0x53, 0xa8, 0x24, 0x9f, 0xa8, 0x07, 0x65, 0xc6, 0xfc, 0x01, 0x08, 0x29, 0x1f, 0xa2, 0x7b, 0xd0,
0x73, 0xc2, 0x59, 0x84, 0x1d, 0x66, 0xc7, 0xe4, 0xc4, 0x13, 0x8b, 0x5a, 0x62, 0x7a, 0x5d, 0xc9,
0x2d, 0x25, 0x36, 0xff, 0x69, 0xc0, 0xcd, 0x73, 0x63, 0x7d, 0x09, 0xf6, 0x8b, 0x20, 0xfe, 0x52,
0xa7, 0x32, 0xe7, 0x70, 0xfb, 0x82, 0x38, 0xbd, 0xc0, 0xd7, 0xd2, 0x92, 0xaf, 0x26, 0x74, 0x88,
0x63, 0x7b, 0x81, 0x4b, 0x4e, 0xed, 0xa9, 0xc7, 0xa8, 0x38, 0x4e, 0xc7, 0x6a, 0x11, 0x67, 0x8f,
0xcb, 0x9e, 0x78, 0x8c, 0x9a, 0x75, 0xa8, 0xee, 0xce, 0x22, 0xb6, 0x30, 0xff, 0x6d, 0xc0, 0xfa,
0x64, 0x1e, 0x91, 0xf8, 0x89, 0x1f, 0x3a, 0xc7, 0xbb, 0xa7, 0x2c, 0xc6, 0xe8, 0x15, 0x74, 0x49,
0x8c, 0xe9, 0x3c, 0xe6, 0x81, 0xe0, 0x7a, 0xc1, 0x91, 0xd8, 0x3c, 0x5f, 0x4a, 0x0a, 0x6b, 0xb6,
0x76, 0xe5, 0x82, 0x1d, 0xa1, 0x6f, 0x75, 0x88, 0xfe, 0x39, 0xfc, 0x03, 0x74, 0x72, 0xf3, 0x3c,
0xca, 0x79, 0xe1, 0x55, 0x87, 0x12, 0x63, 0x9e, 0x3e, 0x11, 0x8e, 0x3d, 0xb6, 0x50, 0x0d, 0x42,
0x7d, 0xf1, 0xe8, 0x56, 0xf5, 0xdf, 0x73, 0xf9, 0x59, 0xca, 0xbc, 0x04, 0x4b, 0xc9, 0x9e, 0x4b,
0xcd, 0x7b, 0xb0, 0xb1, 0xe3, 0x7b, 0x24, 0x60, 0xfb, 0x1e, 0x65, 0x24, 0xb0, 0xc8, 0x9f, 0xe7,
0x84, 0x32, 0xbe, 0x43, 0x80, 0x67, 0x44, 0xb5, 0x1f, 0x31, 0x36, 0xff, 0x02, 0x5d, 0x89, 0xf5,
0x7e, 0xe8, 0x08, 0x84, 0xf9, 0x7d, 0xf0, 0xbe, 0x23, 0x95, 0xf8, 0xb0, 0xd0, 0x90, 0x4a, 0xc5,
0x86, 0x74, 0x1d, 0x1a, 0xa2, 0x62, 0x67, 0xae, 0xd4, 0x79, 0x11, 0xf6, 0x5c, 0x9a, 0xa5, 0x99,
0x2b, 0xa7, 0x2b, 0x62, 0xba, 0x95, 0x14, 0x55, 0xcf, 0xa5, 0xe6, 0x1b, 0xd8, 0xd8, 0x0f, 0xc3,
0xe3, 0x79, 0x24, 0xdd, 0x48, 0x7c, 0xcd, 0x9f, 0xd0, 0x18, 0x95, 0xf9, 0x9e, 0xe9, 0x09, 0x2f,
0xba, 0x6f, 0xf3, 0x5b, 0x03, 0x36, 0xf3, 0x66, 0x55, 0xe9, 0xfa, 0x13, 0x6c, 0xa4, 0x76, 0x6d,
0x5f, 0x9d, 0x59, 0x6e, 0xd0, 0xda, 0x7e, 0xa0, 0x5d, 0xe6, 0xaa, 0xd5, 0x49, 0xfb, 0x72, 0x13,
0xb0, 0xac, 0xfe, 0x49, 0x41, 0x42, 0x87, 0xa7, 0xd0, 0x2b, 0xaa, 0xf1, 0xea, 0x90, 0xee, 0xaa,
0x90, 0x6d, 0x24, 0x2b, 0xd1, 0xcf, 0xa1, 0x99, 0x39, 0x52, 0x12, 0x8e, 0x6c, 0xe4, 0x1c, 0x51,
0x7b, 0x65, 0x5a, 0x68, 0x13, 0xaa, 0x24, 0x8e, 0xc3, 0xa4, 0xaa, 0xca, 0x0f, 0xf3, 0x57, 0xd0,
0xf8, 0xec, 0x5b, 0x34, 0xff, 0x6b, 0x40, 0xe7, 0x31, 0xa5, 0xde, 0x51, 0x1a, 0x2e, 0x9b, 0x50,
0x95, 0x35, 0x4f, 0xd6, 0x76, 0xf9, 0x81, 0x46, 0xd0, 0x52, 0xc9, 0xad, 0x41, 0xaf, 0x8b, 0x2e,
0xac, 0x1b, 0x2a, 0xe1, 0x2b, 0xd2, 0x35, 0x5e, 0xc6, 0x0a, 0x34, 0xa4, 0x7a, 0x26, 0x0d, 0xa9,
0x69, 0x34, 0xe4, 0x06, 0x34, 0xc5, 0xa2, 0x20, 0x74, 0x89, 0xe2, 0x27, 0x0d, 0x2e, 0x78, 0x19,
0xba, 0xc4, 0xfc, 0x87, 0x01, 0xdd, 0xe4, 0x34, 0xea, 0xe6, 0x7b, 0x50, 0x3e, 0x4c, 0xd1, 0xe7,
0xc3, 0x04, 0xa3, 0xd2, 0x59, 0x18, 0x2d, 0x51, 0xaf, 0x14, 0x91, 0x8a, 0x8e, 0x48, 0x7a, 0x19,
0x55, 0xed, 0x32, 0xb8, 0xcb, 0x78, 0xce, 0xde, 0x27, 0x2e, 0xf3, 0xb1, 0x79, 0x04, 0xfd, 0x09,
0xc3, 0xcc, 0xa3, 0xcc, 0x73, 0x68, 0x02, 0x73, 0x01, 0x50, 0xe3, 0x22, 0x40, 0x4b, 0x67, 0x01,
0x5a, 0x4e, 0x01, 0x35, 0xff, 0x63, 0x00, 0xd2, 0x77, 0x52, 0x10, 0x7c, 0x81, 0xad, 0x38, 0x64,
0x2c, 0x64, 0xd8, 0xb7, 0x45, 0x8b, 0x56, 0x8d, 0x56, 0x48, 0x38, 0x0b, 0xe0, 0xb7, 0x34, 0xa7,
0xc4, 0x95, 0xb3, 0xb2, 0xcb, 0x36, 0xb8, 0x40, 0x4c, 0xe6, 0x9b, 0x74, 0xad, 0xd0, 0xa4, 0xcd,
0xc7, 0xd0, 0x9a, 0xb0, 0x30, 0xc6, 0x47, 0xe4, 0xcd, 0x22, 0xfa, 0x14, 0xef, 0x95, 0x77, 0xa5,
0x0c, 0x88, 0x11, 0xc0, 0x4e, 0xe6, 0xfd, 0xaa, 0x02, 0x78, 0x0d, 0xae, 0x64, 0x1a, 0xbc, 0x5e,
0xaa, 0x7b, 0x31, 0x5f, 0xc3, 0xd5, 0xe2, 0x84, 0x82, 0xf1, 0x97, 0xd0, 0xca, 0x20, 0x49, 0x6a,
0xc7, 0x15, 0x2d, 0x65, 0xb3, 0x75, 0x96, 0xae, 0x69, 0xfe, 0x14, 0xae, 0x65, 0x53, 0x4f, 0x45,
0x11, 0x3c, 0xaf, 0x36, 0x0f, 0x61, 0xb0, 0xac, 0x2e, 0x7d, 0x30, 0xff, 0x57, 0x82, 0xf6, 0x53,
0x15, 0xed, 0xbc, 0x3f, 0x6a, 0x1d, 0xb1, 0x29, 0x3a, 0xe2, 0x1d, 0x68, 0xe7, 0x9e, 0x08, 0x92,
0x3c, 0xb5, 0x4e, 0xb4, 0xf7, 0xc1, 0xaa, 0x97, 0x44, 0x59, 0xa8, 0x15, 0x5f, 0x12, 0xf7, 0xa1,
0x7f, 0x18, 0x13, 0xb2, 0xfc, 0xe8, 0xa8, 0x58, 0xeb, 0x7c, 0x42, 0xd7, 0xdd, 0x82, 0x0d, 0xec,
0x30, 0xef, 0xa4, 0xa0, 0x2d, 0xef, 0xbe, 0x2f, 0xa7, 0x74, 0xfd, 0x67, 0xa9, 0xa3, 0x5e, 0x70,
0x18, 0xd2, 0x41, 0xed, 0xd3, 0x1f, 0x0d, 0xea, 0x34, 0x7c, 0x86, 0xa2, 0x03, 0xe8, 0x26, 0xcc,
0x57, 0x59, 0xaa, 0x5f, 0x9a, 0xfe, 0xb6, 0x49, 0x36, 0x45, 0xcd, 0xbf, 0x95, 0xa0, 0x61, 0x61,
0xe7, 0xf8, 0xeb, 0xc6, 0xf7, 0x11, 0xac, 0xa7, 0x75, 0x32, 0x07, 0xf1, 0x35, 0x0d, 0x18, 0x3d,
0x94, 0xac, 0x8e, 0xab, 0x7d, 0x51, 0xf3, 0x7b, 0x03, 0xba, 0x4f, 0xd3, 0x5a, 0xfc, 0x75, 0x83,
0xb1, 0x0d, 0xc0, 0x9b, 0x47, 0x0e, 0x07, 0xbd, 0xd9, 0x26, 0xd7, 0x6d, 0x35, 0x63, 0x35, 0xa2,
0xe6, 0xdf, 0x4b, 0xd0, 0x7e, 0x13, 0x46, 0xa1, 0x1f, 0x1e, 0x2d, 0xbe, 0xee, 0xd3, 0xef, 0x42,
0x5f, 0xeb, 0xb3, 0x39, 0x10, 0xae, 0x17, 0x82, 0x21, 0xbb, 0x6c, 0x6b, 0xdd, 0xcd, 0x7d, 0x53,
0x73, 0x03, 0xfa, 0x8a, 0x33, 0x6a, 0xe5, 0xf2, 0xaf, 0x06, 0x20, 0x5d, 0xaa, 0x6a, 0xe5, 0xaf,
0xa1, 0xc3, 0x14, 0x76, 0x62, 0x3f, 0x45, 0x9b, 0xf5, 0xd8, 0xd3, 0xb1, 0xb5, 0xda, 0x4c, 0x47,
0xfa, 0x67, 0xb0, 0xa9, 0x4e, 0xc6, 0xfb, 0x87, 0xed, 0xf3, 0x37, 0xa5, 0x3d, 0x9b, 0x2a, 0x84,
0xfb, 0x85, 0xd7, 0xe6, 0x8b, 0xa9, 0xf9, 0x0b, 0xb8, 0x22, 0x89, 0xdb, 0xae, 0x93, 0xe7, 0x93,
0x4b, 0x0c, 0xac, 0x93, 0x31, 0x30, 0xf3, 0x3b, 0x03, 0xae, 0x16, 0x97, 0x29, 0xff, 0xcf, 0x5b,
0x87, 0x30, 0x20, 0x55, 0x6f, 0x74, 0x2e, 0x29, 0x29, 0xdc, 0xc3, 0x25, 0x2e, 0x59, 0xb4, 0xbd,
0x95, 0xd4, 0xa1, 0x8c, 0x4e, 0xf6, 0x68, 0x5e, 0x40, 0x87, 0x18, 0xfa, 0x4b, 0x6a, 0x9c, 0x71,
0x27, 0xfb, 0x2a, 0x9f, 0xea, 0x6a, 0xe1, 0x67, 0x90, 0xc9, 0xed, 0xff, 0x57, 0xa1, 0x3e, 0x21,
0xf8, 0x03, 0x21, 0x2e, 0xda, 0x83, 0xce, 0x84, 0x04, 0x6e, 0xf6, 0xc3, 0x6a, 0x53, 0x5b, 0x9c,
0x4a, 0x87, 0x3f, 0x5a, 0x25, 0x4d, 0x7b, 0xd3, 0xda, 0xd8, 0x78, 0x60, 0xa0, 0x03, 0xe8, 0x3c,
0x27, 0x24, 0xda, 0x09, 0x83, 0x80, 0x38, 0x8c, 0xb8, 0xe8, 0x96, 0xde, 0x21, 0x97, 0x9f, 0x27,
0xc3, 0xeb, 0x4b, 0x85, 0x3a, 0xf1, 0x56, 0x59, 0x7c, 0x0d, 0x6d, 0x9d, 0x95, 0xe7, 0x0c, 0xae,
0x78, 0x43, 0x0c, 0x6f, 0x5f, 0x40, 0xe7, 0xcd, 0x35, 0xf4, 0x08, 0x6a, 0x92, 0x26, 0xa2, 0x81,
0xa6, 0x9c, 0xe3, 0xc1, 0x39, 0xbf, 0xf2, 0x9c, 0xd2, 0x5c, 0x43, 0xcf, 0x01, 0x32, 0xa2, 0x85,
0x74, 0x5c, 0x96, 0x98, 0xde, 0xf0, 0xe6, 0x19, 0xb3, 0xa9, 0xb1, 0xdf, 0x43, 0x37, 0x4f, 0x39,
0xd0, 0x68, 0x25, 0xab, 0xd0, 0xf2, 0x6e, 0x78, 0xe7, 0x1c, 0x8d, 0xd4, 0xf0, 0x1f, 0xa1, 0x57,
0x64, 0x12, 0xc8, 0x5c, 0xb9, 0x30, 0xc7, 0x4a, 0x86, 0x77, 0xcf, 0xd5, 0xd1, 0x41, 0xc8, 0x52,
0x3f, 0x07, 0xc2, 0x52, 0x9d, 0xc8, 0x81, 0xb0, 0x5c, 0x2f, 0x24, 0x08, 0xf9, 0x7c, 0xc9, 0x81,
0xb0, 0x32, 0xbb, 0x73, 0x20, 0xac, 0x4e, 0x36, 0x73, 0x6d, 0x5a, 0x13, 0xff, 0x66, 0x1f, 0xfe,
0x10, 0x00, 0x00, 0xff, 0xff, 0xac, 0x38, 0x8b, 0x89, 0xab, 0x15, 0x00, 0x00,
// 1720 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x58, 0xcb, 0x6f, 0x24, 0x47,
0x19, 0x77, 0xcf, 0x7b, 0xbe, 0x79, 0x78, 0xa6, 0xec, 0x75, 0x66, 0x27, 0x6c, 0x76, 0xb6, 0x72,
0x99, 0x84, 0x60, 0x82, 0x13, 0x89, 0x03, 0xa0, 0x28, 0xeb, 0x75, 0xc0, 0x5a, 0x67, 0xe3, 0xed,
0xd9, 0x2c, 0x12, 0x12, 0x6a, 0x7a, 0xba, 0xcb, 0xde, 0x96, 0x7b, 0xba, 0x9b, 0xae, 0x1a, 0xaf,
0x27, 0x1c, 0x38, 0xc0, 0x99, 0x0b, 0xff, 0x04, 0x7f, 0x04, 0xe2, 0xc2, 0x91, 0xbf, 0x82, 0x03,
0x67, 0x24, 0xae, 0x08, 0x09, 0xd5, 0xab, 0xbb, 0xba, 0x67, 0x6c, 0xc7, 0x91, 0xf6, 0xb0, 0xb7,
0xea, 0xef, 0x55, 0x5f, 0xfd, 0xea, 0x7b, 0x55, 0x43, 0x77, 0xe1, 0x52, 0x46, 0xd2, 0xfd, 0x24,
0x8d, 0x59, 0x8c, 0xda, 0xf2, 0xcb, 0x49, 0xe6, 0xf8, 0xaf, 0x75, 0x68, 0xff, 0x82, 0xb8, 0x29,
0x9b, 0x13, 0x97, 0xa1, 0x3e, 0x54, 0x82, 0x64, 0x64, 0x4d, 0xac, 0x69, 0xdb, 0xae, 0x04, 0x09,
0x42, 0x50, 0x4b, 0xe2, 0x94, 0x8d, 0x2a, 0x13, 0x6b, 0xda, 0xb3, 0xc5, 0x1a, 0x3d, 0x00, 0x48,
0x96, 0xf3, 0x30, 0xf0, 0x9c, 0x65, 0x1a, 0x8e, 0xaa, 0x42, 0xb6, 0x2d, 0x29, 0x5f, 0xa7, 0x21,
0x9a, 0xc2, 0x60, 0xe1, 0x5e, 0x39, 0x97, 0x71, 0xb8, 0x5c, 0x10, 0xc7, 0x8b, 0x97, 0x11, 0x1b,
0xd5, 0x84, 0x7a, 0x7f, 0xe1, 0x5e, 0xbd, 0x14, 0xe4, 0x43, 0x4e, 0x45, 0x13, 0xee, 0xd5, 0x95,
0x73, 0x16, 0x84, 0xc4, 0xb9, 0x20, 0xab, 0x51, 0x7d, 0x62, 0x4d, 0x6b, 0x36, 0x2c, 0xdc, 0xab,
0x2f, 0x82, 0x90, 0x3c, 0x25, 0x2b, 0xf4, 0x10, 0x3a, 0xbe, 0xcb, 0x5c, 0xc7, 0x23, 0x11, 0x23,
0xe9, 0xa8, 0x21, 0xf6, 0x02, 0x4e, 0x3a, 0x14, 0x14, 0xee, 0x5f, 0xea, 0x7a, 0x17, 0xa3, 0xa6,
0xe0, 0x88, 0x35, 0xf7, 0xcf, 0xf5, 0x17, 0x41, 0xe4, 0x08, 0xcf, 0x5b, 0x62, 0xeb, 0xb6, 0xa0,
0x9c, 0x72, 0xf7, 0x7f, 0x06, 0x4d, 0xe9, 0x1b, 0x1d, 0xb5, 0x27, 0xd5, 0x69, 0xe7, 0xe0, 0xfd,
0xfd, 0x0c, 0x8d, 0x7d, 0xe9, 0xde, 0x71, 0x74, 0x16, 0xa7, 0x0b, 0x97, 0x05, 0x71, 0xf4, 0x25,
0xa1, 0xd4, 0x3d, 0x27, 0xb6, 0xd6, 0x41, 0xc7, 0xd0, 0x89, 0xc8, 0x6b, 0x47, 0x9b, 0x00, 0x61,
0x62, 0xba, 0x66, 0x62, 0xf6, 0x2a, 0x4e, 0xd9, 0x06, 0x3b, 0x10, 0x91, 0xd7, 0x2f, 0x95, 0xa9,
0xe7, 0xb0, 0xed, 0x93, 0x90, 0x30, 0xe2, 0x67, 0xe6, 0x3a, 0x77, 0x34, 0xd7, 0x57, 0x06, 0xb4,
0xc9, 0x9f, 0x43, 0x9b, 0x78, 0x0e, 0x7d, 0xe5, 0xa6, 0x3e, 0x1d, 0x0d, 0x84, 0xb1, 0x0f, 0xd7,
0x8c, 0x1d, 0x79, 0x33, 0x2e, 0xb0, 0xc1, 0x5c, 0x8b, 0x48, 0x16, 0x45, 0xcf, 0xa0, 0xc7, 0x8f,
0x99, 0x1b, 0x1b, 0xde, 0xd9, 0x18, 0xc7, 0xe9, 0x48, 0xdb, 0x7b, 0x09, 0x43, 0x7d, 0xd6, 0xdc,
0x26, 0xba, 0xb3, 0x4d, 0x0d, 0x98, 0xb6, 0x8b, 0xbf, 0x86, 0x61, 0x16, 0xbd, 0x36, 0xa1, 0x49,
0x1c, 0x51, 0x82, 0xa6, 0xb0, 0x2d, 0x01, 0x9d, 0x05, 0xdf, 0x90, 0x93, 0x60, 0x11, 0x30, 0x11,
0xd2, 0x35, 0xbb, 0x4c, 0x46, 0x7b, 0xd0, 0x08, 0x89, 0xeb, 0x93, 0x54, 0xc5, 0xb1, 0xfa, 0xc2,
0xff, 0xae, 0xc0, 0xe8, 0xba, 0x58, 0x10, 0x49, 0xe2, 0x0b, 0x8b, 0x3d, 0xbb, 0x12, 0xf8, 0x3c,
0x08, 0x69, 0xf0, 0x0d, 0x11, 0x49, 0x52, 0xb3, 0xc5, 0x1a, 0xbd, 0x07, 0xe0, 0xc5, 0x61, 0x48,
0x3c, 0xae, 0xa8, 0x8c, 0x1b, 0x14, 0x1e, 0xa4, 0x22, 0xee, 0xf3, 0xfc, 0xa8, 0xd9, 0x6d, 0x4e,
0x91, 0xa9, 0xf1, 0x08, 0xba, 0xf2, 0xa4, 0x4a, 0x40, 0xa6, 0x46, 0x47, 0xd2, 0xa4, 0xc8, 0x47,
0x80, 0x34, 0xa2, 0xf3, 0x55, 0x26, 0xd8, 0x10, 0x82, 0x03, 0xc5, 0x79, 0xbc, 0xd2, 0xd2, 0xef,
0x42, 0x3b, 0x25, 0xae, 0xef, 0xc4, 0x51, 0xb8, 0x12, 0xd9, 0xd2, 0xb2, 0x5b, 0x9c, 0xf0, 0x55,
0x14, 0xae, 0xd0, 0xf7, 0x61, 0x98, 0x92, 0x24, 0x0c, 0x3c, 0xd7, 0x49, 0x42, 0xd7, 0x23, 0x0b,
0x12, 0xe9, 0xc4, 0x19, 0x28, 0xc6, 0xa9, 0xa6, 0xa3, 0x11, 0x34, 0x2f, 0x49, 0x4a, 0xf9, 0xb1,
0xda, 0x42, 0x44, 0x7f, 0xa2, 0x01, 0x54, 0x19, 0x0b, 0x47, 0x20, 0xa8, 0x7c, 0x89, 0x3e, 0x80,
0x81, 0x17, 0x2f, 0x12, 0xd7, 0x63, 0x4e, 0x4a, 0x2e, 0x03, 0xa1, 0xd4, 0x11, 0xec, 0x6d, 0x45,
0xb7, 0x15, 0x19, 0xff, 0xc5, 0x82, 0x07, 0x37, 0xc6, 0xfa, 0x1a, 0xec, 0xb7, 0x41, 0xfc, 0xa6,
0x4e, 0x85, 0x97, 0xf0, 0xf0, 0x96, 0x38, 0xbd, 0xc5, 0xd7, 0xca, 0x9a, 0xaf, 0x18, 0x7a, 0xc4,
0x73, 0x82, 0xc8, 0x27, 0x57, 0xce, 0x3c, 0x60, 0x54, 0x1c, 0xa7, 0x67, 0x77, 0x88, 0x77, 0xcc,
0x69, 0x8f, 0x03, 0x46, 0x71, 0x13, 0xea, 0x47, 0x8b, 0x84, 0xad, 0xf0, 0xdf, 0x2c, 0xd8, 0x9e,
0x2d, 0x13, 0x92, 0x3e, 0x0e, 0x63, 0xef, 0xe2, 0xe8, 0x8a, 0xa5, 0x2e, 0xfa, 0x0a, 0xfa, 0x24,
0x75, 0xe9, 0x32, 0xe5, 0x81, 0xe0, 0x07, 0xd1, 0xb9, 0xd8, 0xbc, 0x58, 0x4a, 0x4a, 0x3a, 0xfb,
0x47, 0x52, 0xe1, 0x50, 0xc8, 0xdb, 0x3d, 0x62, 0x7e, 0x8e, 0x7f, 0x05, 0xbd, 0x02, 0x9f, 0x47,
0x39, 0x2f, 0xbc, 0xea, 0x50, 0x62, 0xcd, 0xd3, 0x27, 0x71, 0xd3, 0x80, 0xad, 0x54, 0x83, 0x50,
0x5f, 0x3c, 0xba, 0x55, 0xfd, 0x0f, 0x7c, 0x7e, 0x96, 0x2a, 0x2f, 0xc1, 0x92, 0x72, 0xec, 0x53,
0xfc, 0x01, 0xec, 0x1c, 0x86, 0x01, 0x89, 0xd8, 0x49, 0x40, 0x19, 0x89, 0x6c, 0xf2, 0xdb, 0x25,
0xa1, 0x8c, 0xef, 0x10, 0xb9, 0x0b, 0xa2, 0xda, 0x8f, 0x58, 0xe3, 0xdf, 0x43, 0x5f, 0x62, 0x7d,
0x12, 0x7b, 0x02, 0x61, 0x7e, 0x1f, 0xbc, 0xef, 0x48, 0x21, 0xbe, 0x2c, 0x35, 0xa4, 0x4a, 0xb9,
0x21, 0xdd, 0x87, 0x96, 0xa8, 0xd8, 0xb9, 0x2b, 0x4d, 0x5e, 0x84, 0x03, 0x9f, 0xe6, 0x69, 0xe6,
0x4b, 0x76, 0x4d, 0xb0, 0x3b, 0xba, 0xa8, 0x06, 0x3e, 0xc5, 0x2f, 0x60, 0xe7, 0x24, 0x8e, 0x2f,
0x96, 0x89, 0x74, 0x43, 0xfb, 0x5a, 0x3c, 0xa1, 0x35, 0xa9, 0xf2, 0x3d, 0xb3, 0x13, 0xde, 0x76,
0xdf, 0xf8, 0x3f, 0x16, 0xec, 0x16, 0xcd, 0xaa, 0xd2, 0xf5, 0x1b, 0xd8, 0xc9, 0xec, 0x3a, 0xa1,
0x3a, 0xb3, 0xdc, 0xa0, 0x73, 0xf0, 0xb1, 0x71, 0x99, 0x9b, 0xb4, 0x75, 0xfb, 0xf2, 0x35, 0x58,
0xf6, 0xf0, 0xb2, 0x44, 0xa1, 0xe3, 0x2b, 0x18, 0x94, 0xc5, 0x78, 0x75, 0xc8, 0x76, 0x55, 0xc8,
0xb6, 0xb4, 0x26, 0xfa, 0x11, 0xb4, 0x73, 0x47, 0x2a, 0xc2, 0x91, 0x9d, 0x82, 0x23, 0x6a, 0xaf,
0x5c, 0x0a, 0xed, 0x42, 0x9d, 0xa4, 0x69, 0xac, 0xab, 0xaa, 0xfc, 0xc0, 0x3f, 0x81, 0xd6, 0x77,
0xbe, 0x45, 0xfc, 0x0f, 0x0b, 0x7a, 0x9f, 0x53, 0x1a, 0x9c, 0x67, 0xe1, 0xb2, 0x0b, 0x75, 0x59,
0xf3, 0x64, 0x6d, 0x97, 0x1f, 0x68, 0x02, 0x1d, 0x95, 0xdc, 0x06, 0xf4, 0x26, 0xe9, 0xd6, 0xba,
0xa1, 0x12, 0xbe, 0x26, 0x5d, 0xe3, 0x65, 0xac, 0x34, 0x86, 0xd4, 0xaf, 0x1d, 0x43, 0x1a, 0xc6,
0x18, 0xf2, 0x2e, 0xb4, 0x85, 0x52, 0x14, 0xfb, 0x44, 0xcd, 0x27, 0x2d, 0x4e, 0x78, 0x16, 0xfb,
0x04, 0xff, 0xd9, 0x82, 0xbe, 0x3e, 0x8d, 0xba, 0xf9, 0x01, 0x54, 0xcf, 0x32, 0xf4, 0xf9, 0x52,
0x63, 0x54, 0xb9, 0x0e, 0xa3, 0xb5, 0xd1, 0x2b, 0x43, 0xa4, 0x66, 0x22, 0x92, 0x5d, 0x46, 0xdd,
0xb8, 0x0c, 0xee, 0xb2, 0xbb, 0x64, 0xaf, 0xb4, 0xcb, 0x7c, 0x8d, 0xcf, 0x61, 0x38, 0x63, 0x2e,
0x0b, 0x28, 0x0b, 0x3c, 0xaa, 0x61, 0x2e, 0x01, 0x6a, 0xdd, 0x06, 0x68, 0xe5, 0x3a, 0x40, 0xab,
0x19, 0xa0, 0xf8, 0xef, 0x16, 0x20, 0x73, 0x27, 0x05, 0xc1, 0x1b, 0xd8, 0x8a, 0x43, 0xc6, 0x62,
0xe6, 0x86, 0x8e, 0x68, 0xd1, 0xaa, 0xd1, 0x0a, 0x0a, 0x9f, 0x02, 0xf8, 0x2d, 0x2d, 0x29, 0xf1,
0x25, 0x57, 0x76, 0xd9, 0x16, 0x27, 0x08, 0x66, 0xb1, 0x49, 0x37, 0x4a, 0x4d, 0x1a, 0x7f, 0x0e,
0x9d, 0x19, 0x8b, 0x53, 0xf7, 0x9c, 0xbc, 0x58, 0x25, 0xdf, 0xc6, 0x7b, 0xe5, 0x5d, 0x25, 0x07,
0x62, 0x02, 0x70, 0x98, 0x7b, 0xbf, 0xa9, 0x00, 0xfe, 0x0e, 0xee, 0xe5, 0x12, 0xbc, 0x5e, 0xea,
0x7b, 0xf9, 0x14, 0xf6, 0x82, 0xc8, 0x0b, 0x97, 0x3e, 0x71, 0x22, 0xde, 0x7e, 0xc2, 0x6c, 0x88,
0xb4, 0x44, 0x7b, 0xdf, 0x55, 0xdc, 0x67, 0x82, 0xa9, 0x07, 0xc4, 0x8f, 0x00, 0x69, 0x2d, 0xe2,
0x65, 0x1a, 0x15, 0xa1, 0x31, 0x50, 0x9c, 0x23, 0x4f, 0x49, 0xe3, 0xe7, 0xb0, 0x57, 0xde, 0x5c,
0x5d, 0xd5, 0x8f, 0xa1, 0x93, 0xc3, 0xae, 0xeb, 0xd3, 0x3d, 0xa3, 0x2c, 0xe4, 0x7a, 0xb6, 0x29,
0x89, 0x7f, 0x00, 0xef, 0xe4, 0xac, 0x27, 0xa2, 0xd0, 0xde, 0x54, 0xff, 0xc7, 0x30, 0x5a, 0x17,
0x97, 0x3e, 0xe0, 0x7f, 0x56, 0xa0, 0xfb, 0x44, 0x65, 0x14, 0xef, 0xc1, 0x46, 0xd7, 0x6d, 0x8b,
0xae, 0xfb, 0x08, 0xba, 0x85, 0x67, 0x88, 0x1c, 0xd0, 0x3a, 0x97, 0xc6, 0x1b, 0x64, 0xd3, 0x6b,
0xa5, 0x2a, 0xc4, 0xca, 0xaf, 0x95, 0x0f, 0x61, 0x78, 0x96, 0x12, 0xb2, 0xfe, 0xb0, 0xa9, 0xd9,
0xdb, 0x9c, 0x61, 0xca, 0xee, 0xc3, 0x8e, 0xeb, 0xb1, 0xe0, 0xb2, 0x24, 0x2d, 0xe3, 0x6b, 0x28,
0x59, 0xa6, 0xfc, 0x17, 0x99, 0xa3, 0x41, 0x74, 0x16, 0xd3, 0x51, 0xe3, 0xdb, 0x3f, 0x4c, 0xd4,
0x69, 0x38, 0x87, 0xa2, 0x53, 0xe8, 0xeb, 0xe9, 0x5a, 0x59, 0x6a, 0xde, 0x79, 0xc4, 0xee, 0x92,
0x9c, 0x45, 0xf1, 0x1f, 0x2b, 0xd0, 0xb2, 0x5d, 0xef, 0xe2, 0xed, 0xc6, 0xf7, 0x33, 0xd8, 0xce,
0x6a, 0x71, 0x01, 0xe2, 0x77, 0x0c, 0x60, 0xcc, 0x50, 0xb2, 0x7b, 0xbe, 0xf1, 0x45, 0xf1, 0xff,
0x2c, 0xe8, 0x3f, 0xc9, 0xea, 0xfd, 0xdb, 0x0d, 0xc6, 0x01, 0x00, 0x6f, 0x50, 0x05, 0x1c, 0xcc,
0x86, 0xae, 0xaf, 0xdb, 0x6e, 0xa7, 0x6a, 0x45, 0xf1, 0x9f, 0x2a, 0xd0, 0x7d, 0x11, 0x27, 0x71,
0x18, 0x9f, 0xaf, 0xde, 0xee, 0xd3, 0x1f, 0xc1, 0xd0, 0xe8, 0xe5, 0x05, 0x10, 0xee, 0x97, 0x82,
0x21, 0xbf, 0x6c, 0x7b, 0xdb, 0x2f, 0x7c, 0x53, 0xbc, 0x03, 0x43, 0x35, 0x97, 0xe6, 0x25, 0x19,
0xff, 0xc1, 0x02, 0x64, 0x52, 0x55, 0xad, 0xfc, 0x29, 0xf4, 0x98, 0xc2, 0x4e, 0xec, 0xa7, 0x46,
0x73, 0x33, 0xf6, 0x4c, 0x6c, 0xed, 0x2e, 0x33, 0x91, 0xfe, 0x21, 0xec, 0xaa, 0x93, 0xf1, 0x1e,
0xe5, 0x84, 0xfc, 0xdd, 0xea, 0x2c, 0xe6, 0x0a, 0xe1, 0x61, 0xe9, 0x45, 0xfb, 0xe5, 0x1c, 0x7f,
0x0a, 0xf7, 0xe4, 0x70, 0xa8, 0xeb, 0xb8, 0xae, 0xaf, 0x6b, 0x53, 0x5e, 0x2f, 0x9f, 0xf2, 0xf0,
0x7f, 0x2d, 0xd8, 0x2b, 0xab, 0x29, 0xff, 0x6f, 0xd2, 0x43, 0x2e, 0x20, 0x55, 0x6f, 0xcc, 0x79,
0x55, 0x8e, 0x89, 0x9f, 0xac, 0xcd, 0xab, 0x65, 0xdb, 0xfb, 0xba, 0x0e, 0xe5, 0x23, 0xeb, 0x80,
0x16, 0x09, 0x74, 0xec, 0xc2, 0x70, 0x4d, 0x8c, 0x4f, 0xf5, 0x7a, 0x5f, 0xe5, 0x53, 0x53, 0x29,
0x7e, 0x87, 0x81, 0xf5, 0xe0, 0x5f, 0x75, 0x68, 0xce, 0x88, 0xfb, 0x9a, 0x10, 0x1f, 0x1d, 0x43,
0x6f, 0x46, 0x22, 0x3f, 0xff, 0x29, 0xb6, 0x6b, 0x28, 0x67, 0xd4, 0xf1, 0xf7, 0x36, 0x51, 0xb3,
0xde, 0xb4, 0x35, 0xb5, 0x3e, 0xb6, 0xd0, 0x29, 0xf4, 0x9e, 0x12, 0x92, 0x1c, 0xc6, 0x51, 0x44,
0x3c, 0x46, 0x7c, 0xf4, 0x9e, 0xd9, 0x21, 0xd7, 0x9f, 0x40, 0xe3, 0xfb, 0x6b, 0x85, 0x5a, 0x7b,
0xab, 0x2c, 0x3e, 0x87, 0xae, 0x39, 0xf9, 0x17, 0x0c, 0x6e, 0x78, 0xa7, 0x8c, 0x1f, 0xde, 0xf2,
0x64, 0xc0, 0x5b, 0xe8, 0x33, 0x68, 0xc8, 0x51, 0x14, 0x8d, 0x0c, 0xe1, 0xc2, 0xac, 0x5d, 0xf0,
0xab, 0x38, 0xb7, 0xe2, 0x2d, 0xf4, 0x14, 0x20, 0x1f, 0xe6, 0x90, 0x89, 0xcb, 0xda, 0x34, 0x39,
0x7e, 0x70, 0x0d, 0x37, 0x33, 0xf6, 0x4b, 0xe8, 0x17, 0x47, 0x0e, 0x34, 0xd9, 0x38, 0x55, 0x18,
0x79, 0x37, 0x7e, 0x74, 0x83, 0x44, 0x66, 0xf8, 0xd7, 0x30, 0x28, 0x4f, 0x12, 0x08, 0x6f, 0x54,
0x2c, 0x4c, 0x25, 0xe3, 0xf7, 0x6f, 0x94, 0x31, 0x41, 0xc8, 0x53, 0xbf, 0x00, 0xc2, 0x5a, 0x9d,
0x28, 0x80, 0xb0, 0x5e, 0x2f, 0x24, 0x08, 0xc5, 0x7c, 0x29, 0x80, 0xb0, 0x31, 0xbb, 0x0b, 0x20,
0x6c, 0x4e, 0x36, 0xbc, 0x35, 0x6f, 0x88, 0xff, 0xbf, 0x9f, 0xfc, 0x3f, 0x00, 0x00, 0xff, 0xff,
0x2e, 0x8c, 0xaa, 0x4f, 0x0f, 0x16, 0x00, 0x00,
}

2
weed/server/master_grpc_server_collection.go
View file

@ -16,7 +16,7 @@ func (ms *MasterServer) CollectionList(ctx context.Context, req *master_pb.Colle
}
resp := &master_pb.CollectionListResponse{}
collections := ms.Topo.ListCollections()
collections := ms.Topo.ListCollections(req.IncludeNormalVolumes, req.IncludeEcVolumes)
for _, c := range collections {
resp.Collections = append(resp.Collections, &master_pb.Collection{
Name: c,

9
weed/shell/command_collection_list.go
View file

@ -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 {

2
weed/shell/command_ec_balance.go
View file

@ -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
}

2
weed/shell/command_volume_balance.go
View file

@ -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
}

12
weed/topology/topology.go
View file

@ -126,18 +126,20 @@ func (t *Topology) GetVolumeLayout(collectionName string, rp *storage.ReplicaPla
}).(*Collection).GetOrCreateVolumeLayout(rp, ttl)
}
func (t *Topology) ListCollections() (ret []string) {
func (t *Topology) ListCollections(includeNormalVolumes, includeEcVolumes bool) (ret []string) {
mapOfCollections := make(map[string]bool)
for _, c := range t.collectionMap.Items() {
mapOfCollections[c.(*Collection).Name] = true
}
t.ecShardMapLock.RLock()
for _, ecVolumeLocation := range t.ecShardMap {
mapOfCollections[ecVolumeLocation.Collection] = true
if includeEcVolumes {
t.ecShardMapLock.RLock()
for _, ecVolumeLocation := range t.ecShardMap {
mapOfCollections[ecVolumeLocation.Collection] = true
}
t.ecShardMapLock.RUnlock()
}
t.ecShardMapLock.RUnlock()
for k, _ := range mapOfCollections {
ret = append(ret, k)