Mirror
/
seaweedfs
mirror of https://github.com/seaweedfs/seaweedfs.git
1
0
Fork 0
Code Issues Projects Releases Wiki Activity
Browse Source

ec shard info can be queried via VolumeList()

pull/991/head
Chris Lu 6 years ago
parent
17ac1290c0
commit
7180520889
6 changed files with 193 additions and 113 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 1
      weed/pb/master.proto
  2. 221
      weed/pb/master_pb/master.pb.go
  3. 6
      weed/storage/erasure_coding/ec_volume.go
  4. 46
      weed/storage/erasure_coding/ec_volume_info.go
  5. 18
      weed/topology/data_node.go
  6. 14
      weed/topology/data_node_ec.go

1
weed/pb/master.proto
View File

@ -186,6 +186,7 @@ message DataNodeInfo {
uint64 free_volume_count = 4;
uint64 active_volume_count = 5;
repeated VolumeInformationMessage volume_infos = 6;
repeated VolumeEcShardInformationMessage ec_shard_infos = 7;
}
message RackInfo {
string id = 1;

221
weed/pb/master_pb/master.pb.go
View File

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

6
weed/storage/erasure_coding/ec_volume.go
View File

@ -10,9 +10,11 @@ import (
"github.com/chrislusf/seaweedfs/weed/storage/needle"
)
type ShardId uint8
type EcVolumeShard struct {
VolumeId needle.VolumeId
ShardId uint8
ShardId ShardId
Collection string
dir string
ecdFile *os.File
@ -22,7 +24,7 @@ type EcVolumeShards []*EcVolumeShard
func NewEcVolumeShard(dirname string, collection string, id needle.VolumeId, shardId int) (v *EcVolumeShard, e error) {
v = &EcVolumeShard{dir: dirname, Collection: collection, VolumeId: id, ShardId: uint8(shardId)}
v = &EcVolumeShard{dir: dirname, Collection: collection, VolumeId: id, ShardId: ShardId(shardId)}
baseFileName := v.FileName()
if v.ecxFile, e = os.OpenFile(baseFileName+".ecx", os.O_RDONLY, 0644); e != nil {

46
weed/storage/erasure_coding/ec_volume_info.go
View File

@ -0,0 +1,46 @@
package erasure_coding
import (
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
)
// data structure used in master
type EcVolumeInfo struct {
VolumeId needle.VolumeId
Collection string
shardIds uint16 // use bits to indicate the shard id
}
func (ecInfo *EcVolumeInfo) AddShardId(id ShardId) {
ecInfo.shardIds |= (1 << id)
}
func (ecInfo *EcVolumeInfo) RemoveShardId(id ShardId) {
ecInfo.shardIds &^= (1 << id)
}
func (ecInfo *EcVolumeInfo) HasShardId(id ShardId) bool {
return ecInfo.shardIds&(1<<id) > 0
}
func (ecInfo *EcVolumeInfo) ShardIds() (ret []ShardId) {
for i := ShardId(0); i < DataShardsCount+ParityShardsCount; i++ {
if ecInfo.HasShardId(i) {
ret = append(ret, i)
}
}
return
}
func (ecInfo *EcVolumeInfo) ToVolumeEcShardInformationMessage() (ret []*master_pb.VolumeEcShardInformationMessage) {
for _, shard := range ecInfo.ShardIds() {
ret = append(ret, &master_pb.VolumeEcShardInformationMessage{
Id: uint32(ecInfo.VolumeId),
EcIndex: uint32(shard),
Collection: ecInfo.Collection,
})
}
return
}

18
weed/topology/data_node.go
View File

@ -2,8 +2,10 @@ package topology
import (
"fmt"
"sync"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/storage/erasure_coding"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
"strconv"
@ -14,11 +16,13 @@ import (
type DataNode struct {
NodeImpl
volumes map[needle.VolumeId]storage.VolumeInfo
Ip string
Port int
PublicUrl string
LastSeen int64 // unix time in seconds
volumes map[needle.VolumeId]storage.VolumeInfo
Ip string
Port int
PublicUrl string
LastSeen int64 // unix time in seconds
ecShards map[needle.VolumeId]erasure_coding.EcVolumeInfo
ecShardsLock sync.RWMutex
}
func NewDataNode(id string) *DataNode {
@ -26,6 +30,7 @@ func NewDataNode(id string) *DataNode {
s.id = NodeId(id)
s.nodeType = "DataNode"
s.volumes = make(map[needle.VolumeId]storage.VolumeInfo)
s.ecShards = make(map[needle.VolumeId]erasure_coding.EcVolumeInfo)
s.NodeImpl.value = s
return s
}
@ -158,5 +163,8 @@ func (dn *DataNode) ToDataNodeInfo() *master_pb.DataNodeInfo {
for _, v := range dn.GetVolumes() {
m.VolumeInfos = append(m.VolumeInfos, v.ToVolumeInformationMessage())
}
for _, ecv := range dn.GetEcShards() {
m.EcShardInfos = append(m.EcShardInfos, ecv.ToVolumeEcShardInformationMessage()...)
}
return m
}

14
weed/topology/data_node_ec.go
View File

@ -0,0 +1,14 @@
package topology
import (
"github.com/chrislusf/seaweedfs/weed/storage/erasure_coding"
)
func (dn *DataNode) GetEcShards() (ret []erasure_coding.EcVolumeInfo) {
dn.RLock()
for _, ecVolumeInfo := range dn.ecShards {
ret = append(ret, ecVolumeInfo)
}
dn.RUnlock()
return ret
}
Write Preview
Loading…
Cancel
Save