aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--weed/pb/master.proto2
-rw-r--r--weed/pb/master_pb/master.pb.go212
-rw-r--r--weed/server/volume_grpc_client_to_master.go7
-rw-r--r--weed/shell/command_volume_list.go4
-rw-r--r--weed/storage/erasure_coding/ec_volume.go23
-rw-r--r--weed/storage/erasure_coding/ec_volume_info.go59
-rw-r--r--weed/storage/store_ec.go2
-rw-r--r--weed/topology/data_node.go2
-rw-r--r--weed/topology/topology_ec.go19
9 files changed, 175 insertions, 155 deletions
diff --git a/weed/pb/master.proto b/weed/pb/master.proto
index c1d3ac00d..6f7db5d96 100644
--- a/weed/pb/master.proto
+++ b/weed/pb/master.proto
@@ -77,7 +77,7 @@ message VolumeShortInformationMessage {
message VolumeEcShardInformationMessage {
uint32 id = 1;
string collection = 2;
- uint32 ec_index = 3;
+ uint32 ec_index_bits = 3;
}
message Empty {
diff --git a/weed/pb/master_pb/master.pb.go b/weed/pb/master_pb/master.pb.go
index 29ec83050..70326384e 100644
--- a/weed/pb/master_pb/master.pb.go
+++ b/weed/pb/master_pb/master.pb.go
@@ -352,9 +352,9 @@ func (m *VolumeShortInformationMessage) GetTtl() uint32 {
}
type VolumeEcShardInformationMessage struct {
- Id uint32 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"`
- Collection string `protobuf:"bytes,2,opt,name=collection" json:"collection,omitempty"`
- EcIndex uint32 `protobuf:"varint,3,opt,name=ec_index,json=ecIndex" json:"ec_index,omitempty"`
+ Id uint32 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"`
+ Collection string `protobuf:"bytes,2,opt,name=collection" json:"collection,omitempty"`
+ EcIndexBits uint32 `protobuf:"varint,3,opt,name=ec_index_bits,json=ecIndexBits" json:"ec_index_bits,omitempty"`
}
func (m *VolumeEcShardInformationMessage) Reset() { *m = VolumeEcShardInformationMessage{} }
@@ -376,9 +376,9 @@ func (m *VolumeEcShardInformationMessage) GetCollection() string {
return ""
}
-func (m *VolumeEcShardInformationMessage) GetEcIndex() uint32 {
+func (m *VolumeEcShardInformationMessage) GetEcIndexBits() uint32 {
if m != nil {
- return m.EcIndex
+ return m.EcIndexBits
}
return 0
}
@@ -1562,105 +1562,105 @@ var _Seaweed_serviceDesc = grpc.ServiceDesc{
func init() { proto.RegisterFile("master.proto", fileDescriptor0) }
var fileDescriptor0 = []byte{
- // 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,
+ // 1594 bytes of a gzipped FileDescriptorProto
+ 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x58, 0x4f, 0x6f, 0xdb, 0xc6,
+ 0x12, 0x37, 0xf5, 0xcf, 0xd2, 0xe8, 0x8f, 0xa5, 0xb5, 0x93, 0x30, 0xca, 0x4b, 0xa2, 0x30, 0x17,
+ 0x25, 0xef, 0x3d, 0xbf, 0x3c, 0xf7, 0xd0, 0x43, 0x5b, 0x04, 0x89, 0xe3, 0xb4, 0x46, 0x9c, 0xc4,
+ 0xa1, 0x92, 0x14, 0x28, 0x50, 0xb0, 0x14, 0xb9, 0x76, 0x08, 0x53, 0x24, 0xcb, 0x5d, 0x39, 0x56,
+ 0x2e, 0x3d, 0xb4, 0xc7, 0xa2, 0x97, 0x7e, 0x89, 0x7e, 0x88, 0xa2, 0x97, 0x1e, 0xfb, 0x29, 0xfa,
+ 0x09, 0x0a, 0xf4, 0x5e, 0xa0, 0xd8, 0x3f, 0x24, 0x97, 0x94, 0x6c, 0xc5, 0x05, 0x72, 0xc8, 0x6d,
+ 0x77, 0x66, 0xf6, 0xb7, 0xb3, 0xbf, 0x9d, 0x9d, 0x19, 0x12, 0x5a, 0x13, 0x9b, 0x50, 0x1c, 0x6f,
+ 0x46, 0x71, 0x48, 0x43, 0xd4, 0x10, 0x33, 0x2b, 0x1a, 0x1b, 0x3f, 0x57, 0xa1, 0xf1, 0x19, 0xb6,
+ 0x63, 0x3a, 0xc6, 0x36, 0x45, 0x1d, 0x28, 0x79, 0x91, 0xae, 0x0d, 0xb4, 0x61, 0xc3, 0x2c, 0x79,
+ 0x11, 0x42, 0x50, 0x89, 0xc2, 0x98, 0xea, 0xa5, 0x81, 0x36, 0x6c, 0x9b, 0x7c, 0x8c, 0xae, 0x02,
+ 0x44, 0xd3, 0xb1, 0xef, 0x39, 0xd6, 0x34, 0xf6, 0xf5, 0x32, 0xb7, 0x6d, 0x08, 0xc9, 0x8b, 0xd8,
+ 0x47, 0x43, 0xe8, 0x4e, 0xec, 0x13, 0xeb, 0x38, 0xf4, 0xa7, 0x13, 0x6c, 0x39, 0xe1, 0x34, 0xa0,
+ 0x7a, 0x85, 0x2f, 0xef, 0x4c, 0xec, 0x93, 0x97, 0x5c, 0xbc, 0xcd, 0xa4, 0x68, 0xc0, 0xbc, 0x3a,
+ 0xb1, 0x0e, 0x3c, 0x1f, 0x5b, 0x47, 0x78, 0xa6, 0x57, 0x07, 0xda, 0xb0, 0x62, 0xc2, 0xc4, 0x3e,
+ 0x79, 0xe8, 0xf9, 0xf8, 0x11, 0x9e, 0xa1, 0xeb, 0xd0, 0x74, 0x6d, 0x6a, 0x5b, 0x0e, 0x0e, 0x28,
+ 0x8e, 0xf5, 0x1a, 0xdf, 0x0b, 0x98, 0x68, 0x9b, 0x4b, 0x98, 0x7f, 0xb1, 0xed, 0x1c, 0xe9, 0xab,
+ 0x5c, 0xc3, 0xc7, 0xcc, 0x3f, 0xdb, 0x9d, 0x78, 0x81, 0xc5, 0x3d, 0xaf, 0xf3, 0xad, 0x1b, 0x5c,
+ 0xb2, 0xcf, 0xdc, 0xff, 0x04, 0x56, 0x85, 0x6f, 0x44, 0x6f, 0x0c, 0xca, 0xc3, 0xe6, 0xd6, 0xcd,
+ 0xcd, 0x94, 0x8d, 0x4d, 0xe1, 0xde, 0x6e, 0x70, 0x10, 0xc6, 0x13, 0x9b, 0x7a, 0x61, 0xf0, 0x18,
+ 0x13, 0x62, 0x1f, 0x62, 0x33, 0x59, 0x83, 0x76, 0xa1, 0x19, 0xe0, 0xd7, 0x56, 0x02, 0x01, 0x1c,
+ 0x62, 0x38, 0x07, 0x31, 0x7a, 0x15, 0xc6, 0x74, 0x01, 0x0e, 0x04, 0xf8, 0xf5, 0x4b, 0x09, 0xf5,
+ 0x0c, 0xd6, 0x5c, 0xec, 0x63, 0x8a, 0xdd, 0x14, 0xae, 0x79, 0x4e, 0xb8, 0x8e, 0x04, 0x48, 0x20,
+ 0x3f, 0x85, 0x06, 0x76, 0x2c, 0xf2, 0xca, 0x8e, 0x5d, 0xa2, 0x77, 0x39, 0xd8, 0xed, 0x39, 0xb0,
+ 0x1d, 0x67, 0xc4, 0x0c, 0x16, 0xc0, 0xd5, 0xb1, 0x50, 0x11, 0xf4, 0x04, 0xda, 0xec, 0x98, 0x19,
+ 0x58, 0xef, 0xdc, 0x60, 0x8c, 0xa7, 0x9d, 0x04, 0xef, 0x25, 0xf4, 0x92, 0xb3, 0x66, 0x98, 0xe8,
+ 0xdc, 0x98, 0x09, 0x61, 0x09, 0xae, 0xf1, 0x02, 0x7a, 0x69, 0xf4, 0x9a, 0x98, 0x44, 0x61, 0x40,
+ 0x30, 0x1a, 0xc2, 0x9a, 0x20, 0x74, 0xe4, 0xbd, 0xc1, 0x7b, 0xde, 0xc4, 0xa3, 0x3c, 0xa4, 0x2b,
+ 0x66, 0x51, 0x8c, 0x2e, 0x42, 0xcd, 0xc7, 0xb6, 0x8b, 0x63, 0x19, 0xc7, 0x72, 0x66, 0xfc, 0x51,
+ 0x02, 0xfd, 0xb4, 0x58, 0xe0, 0x8f, 0xc4, 0xe5, 0x88, 0x6d, 0xb3, 0xe4, 0xb9, 0x2c, 0x08, 0x89,
+ 0xf7, 0x06, 0xf3, 0x47, 0x52, 0x31, 0xf9, 0x18, 0x5d, 0x03, 0x70, 0x42, 0xdf, 0xc7, 0x0e, 0x5b,
+ 0x28, 0xc1, 0x15, 0x09, 0x0b, 0x52, 0x1e, 0xf7, 0xd9, 0xfb, 0xa8, 0x98, 0x0d, 0x26, 0x11, 0x4f,
+ 0xe3, 0x06, 0xb4, 0xc4, 0x49, 0xa5, 0x81, 0x78, 0x1a, 0x4d, 0x21, 0x13, 0x26, 0xff, 0x01, 0x94,
+ 0x30, 0x3a, 0x9e, 0xa5, 0x86, 0x35, 0x6e, 0xd8, 0x95, 0x9a, 0xfb, 0xb3, 0xc4, 0xfa, 0x0a, 0x34,
+ 0x62, 0x6c, 0xbb, 0x56, 0x18, 0xf8, 0x33, 0xfe, 0x5a, 0xea, 0x66, 0x9d, 0x09, 0x9e, 0x06, 0xfe,
+ 0x0c, 0xfd, 0x1b, 0x7a, 0x31, 0x8e, 0x7c, 0xcf, 0xb1, 0xad, 0xc8, 0xb7, 0x1d, 0x3c, 0xc1, 0x41,
+ 0xf2, 0x70, 0xba, 0x52, 0xb1, 0x9f, 0xc8, 0x91, 0x0e, 0xab, 0xc7, 0x38, 0x26, 0xec, 0x58, 0x0d,
+ 0x6e, 0x92, 0x4c, 0x51, 0x17, 0xca, 0x94, 0xfa, 0x3a, 0x70, 0x29, 0x1b, 0xa2, 0x5b, 0xd0, 0x75,
+ 0xc2, 0x49, 0x64, 0x3b, 0xd4, 0x8a, 0xf1, 0xb1, 0xc7, 0x17, 0x35, 0xb9, 0x7a, 0x4d, 0xca, 0x4d,
+ 0x29, 0x36, 0x7e, 0xd2, 0xe0, 0xea, 0x99, 0xb1, 0x3e, 0x47, 0xfb, 0x32, 0x8a, 0xdf, 0xd5, 0xa9,
+ 0x8c, 0x29, 0x5c, 0x5f, 0x12, 0xa7, 0x4b, 0x7c, 0x2d, 0xcd, 0xf9, 0x6a, 0x40, 0x1b, 0x3b, 0x96,
+ 0x17, 0xb8, 0xf8, 0xc4, 0x1a, 0x7b, 0x94, 0xf0, 0xe3, 0xb4, 0xcd, 0x26, 0x76, 0x76, 0x99, 0xec,
+ 0xbe, 0x47, 0x89, 0xb1, 0x0a, 0xd5, 0x9d, 0x49, 0x44, 0x67, 0xc6, 0x2f, 0x1a, 0xac, 0x8d, 0xa6,
+ 0x11, 0x8e, 0xef, 0xfb, 0xa1, 0x73, 0xb4, 0x73, 0x42, 0x63, 0x1b, 0x3d, 0x85, 0x0e, 0x8e, 0x6d,
+ 0x32, 0x8d, 0x59, 0x20, 0xb8, 0x5e, 0x70, 0xc8, 0x37, 0xcf, 0xa7, 0x92, 0xc2, 0x9a, 0xcd, 0x1d,
+ 0xb1, 0x60, 0x9b, 0xdb, 0x9b, 0x6d, 0xac, 0x4e, 0xfb, 0x5f, 0x40, 0x3b, 0xa7, 0x67, 0x51, 0xce,
+ 0x12, 0xaf, 0x3c, 0x14, 0x1f, 0xb3, 0xe7, 0x13, 0xd9, 0xb1, 0x47, 0x67, 0xb2, 0x40, 0xc8, 0x19,
+ 0x8b, 0x6e, 0x99, 0xff, 0x3d, 0x97, 0x9d, 0xa5, 0xcc, 0x52, 0xb0, 0x90, 0xec, 0xba, 0xc4, 0xb8,
+ 0x05, 0xeb, 0xdb, 0xbe, 0x87, 0x03, 0xba, 0xe7, 0x11, 0x8a, 0x03, 0x13, 0x7f, 0x3d, 0xc5, 0x84,
+ 0xb2, 0x1d, 0x02, 0x7b, 0x82, 0x65, 0xf9, 0xe1, 0x63, 0xe3, 0x1b, 0xe8, 0x08, 0xae, 0xf7, 0x42,
+ 0x87, 0x33, 0xcc, 0xee, 0x83, 0xd5, 0x1d, 0x61, 0xc4, 0x86, 0x85, 0x82, 0x54, 0x2a, 0x16, 0xa4,
+ 0xcb, 0x50, 0xe7, 0x19, 0x3b, 0x73, 0x65, 0x95, 0x25, 0x61, 0xcf, 0x25, 0xd9, 0x33, 0x73, 0x85,
+ 0xba, 0xc2, 0xd5, 0xcd, 0x24, 0xa9, 0x7a, 0x2e, 0x31, 0x9e, 0xc3, 0xfa, 0x5e, 0x18, 0x1e, 0x4d,
+ 0x23, 0xe1, 0x46, 0xe2, 0x6b, 0xfe, 0x84, 0xda, 0xa0, 0xcc, 0xf6, 0x4c, 0x4f, 0xb8, 0xec, 0xbe,
+ 0x8d, 0x3f, 0x35, 0xd8, 0xc8, 0xc3, 0xca, 0xd4, 0xf5, 0x15, 0xac, 0xa7, 0xb8, 0x96, 0x2f, 0xcf,
+ 0x2c, 0x36, 0x68, 0x6e, 0xdd, 0x51, 0x2e, 0x73, 0xd1, 0xea, 0xa4, 0x7c, 0xb9, 0x09, 0x59, 0x66,
+ 0xef, 0xb8, 0x20, 0x21, 0xfd, 0x13, 0xe8, 0x16, 0xcd, 0x58, 0x76, 0x48, 0x77, 0x95, 0xcc, 0xd6,
+ 0x93, 0x95, 0xe8, 0xff, 0xd0, 0xc8, 0x1c, 0x29, 0x71, 0x47, 0xd6, 0x73, 0x8e, 0xc8, 0xbd, 0x32,
+ 0x2b, 0xb4, 0x01, 0x55, 0x1c, 0xc7, 0x61, 0x92, 0x55, 0xc5, 0xc4, 0xf8, 0x08, 0xea, 0xff, 0xf8,
+ 0x16, 0x8d, 0xdf, 0x34, 0x68, 0xdf, 0x23, 0xc4, 0x3b, 0x4c, 0xc3, 0x65, 0x03, 0xaa, 0x22, 0xe7,
+ 0x89, 0xdc, 0x2e, 0x26, 0x68, 0x00, 0x4d, 0xf9, 0xb8, 0x15, 0xea, 0x55, 0xd1, 0xd2, 0xbc, 0x21,
+ 0x1f, 0x7c, 0x45, 0xb8, 0xc6, 0xd2, 0x58, 0xa1, 0x0d, 0xa9, 0x9e, 0xda, 0x86, 0xd4, 0x94, 0x36,
+ 0xe4, 0x0a, 0x34, 0xf8, 0xa2, 0x20, 0x74, 0xb1, 0xec, 0x4f, 0xea, 0x4c, 0xf0, 0x24, 0x74, 0xb1,
+ 0xf1, 0xa3, 0x06, 0x9d, 0xe4, 0x34, 0xf2, 0xe6, 0xbb, 0x50, 0x3e, 0x48, 0xd9, 0x67, 0xc3, 0x84,
+ 0xa3, 0xd2, 0x69, 0x1c, 0xcd, 0xb5, 0x5e, 0x29, 0x23, 0x15, 0x95, 0x91, 0xf4, 0x32, 0xaa, 0xca,
+ 0x65, 0x30, 0x97, 0xed, 0x29, 0x7d, 0x95, 0xb8, 0xcc, 0xc6, 0xc6, 0x21, 0xf4, 0x46, 0xd4, 0xa6,
+ 0x1e, 0xa1, 0x9e, 0x43, 0x12, 0x9a, 0x0b, 0x84, 0x6a, 0xcb, 0x08, 0x2d, 0x9d, 0x46, 0x68, 0x39,
+ 0x25, 0xd4, 0xf8, 0x55, 0x03, 0xa4, 0xee, 0x24, 0x29, 0x78, 0x07, 0x5b, 0x31, 0xca, 0x68, 0x48,
+ 0x6d, 0xdf, 0xe2, 0x25, 0x5a, 0x16, 0x5a, 0x2e, 0x61, 0x5d, 0x00, 0xbb, 0xa5, 0x29, 0xc1, 0xae,
+ 0xd0, 0x8a, 0x2a, 0x5b, 0x67, 0x02, 0xae, 0xcc, 0x17, 0xe9, 0x5a, 0xa1, 0x48, 0x1b, 0xf7, 0xa0,
+ 0x39, 0xa2, 0x61, 0x6c, 0x1f, 0xe2, 0xe7, 0xb3, 0xe8, 0x6d, 0xbc, 0x97, 0xde, 0x95, 0x32, 0x22,
+ 0x06, 0x00, 0xdb, 0x99, 0xf7, 0x8b, 0x12, 0xe0, 0x25, 0xb8, 0x90, 0x59, 0xb0, 0x7c, 0x29, 0xef,
+ 0xc5, 0x78, 0x06, 0x17, 0x8b, 0x0a, 0x49, 0xe3, 0x87, 0xd0, 0xcc, 0x28, 0x49, 0x72, 0xc7, 0x05,
+ 0xe5, 0xc9, 0x66, 0xeb, 0x4c, 0xd5, 0xd2, 0xf8, 0x2f, 0x5c, 0xca, 0x54, 0x0f, 0x78, 0x12, 0x3c,
+ 0x2b, 0x37, 0xf7, 0x41, 0x9f, 0x37, 0x17, 0x3e, 0x18, 0xbf, 0x97, 0xa0, 0xf5, 0x40, 0x46, 0x3b,
+ 0xab, 0x8f, 0x4a, 0x45, 0x6c, 0xf0, 0x8a, 0x78, 0x03, 0x5a, 0xb9, 0x4f, 0x04, 0xd1, 0x3c, 0x35,
+ 0x8f, 0x95, 0xef, 0x83, 0x45, 0x5f, 0x12, 0x65, 0x6e, 0x56, 0xfc, 0x92, 0xb8, 0x0d, 0xbd, 0x83,
+ 0x18, 0xe3, 0xf9, 0x8f, 0x8e, 0x8a, 0xb9, 0xc6, 0x14, 0xaa, 0xed, 0x26, 0xac, 0xdb, 0x0e, 0xf5,
+ 0x8e, 0x0b, 0xd6, 0xe2, 0xee, 0x7b, 0x42, 0xa5, 0xda, 0x3f, 0x4c, 0x1d, 0xf5, 0x82, 0x83, 0x90,
+ 0xe8, 0xb5, 0xb7, 0xff, 0x68, 0x90, 0xa7, 0x61, 0x1a, 0x82, 0xf6, 0xa1, 0x93, 0x74, 0xbe, 0x12,
+ 0x69, 0xf5, 0xdc, 0xed, 0x6f, 0x0b, 0x67, 0x2a, 0x62, 0x7c, 0x57, 0x82, 0xba, 0x69, 0x3b, 0x47,
+ 0xef, 0x37, 0xbf, 0x77, 0x61, 0x2d, 0xcd, 0x93, 0x39, 0x8a, 0x2f, 0x29, 0xc4, 0xa8, 0xa1, 0x64,
+ 0xb6, 0x5d, 0x65, 0x46, 0x8c, 0xbf, 0x34, 0xe8, 0x3c, 0x48, 0x73, 0xf1, 0xfb, 0x4d, 0xc6, 0x16,
+ 0x00, 0x2b, 0x1e, 0x39, 0x1e, 0xd4, 0x62, 0x9b, 0x5c, 0xb7, 0xd9, 0x88, 0xe5, 0x88, 0x18, 0x3f,
+ 0x94, 0xa0, 0xf5, 0x3c, 0x8c, 0x42, 0x3f, 0x3c, 0x9c, 0xbd, 0xdf, 0xa7, 0xdf, 0x81, 0x9e, 0x52,
+ 0x67, 0x73, 0x24, 0x5c, 0x2e, 0x04, 0x43, 0x76, 0xd9, 0xe6, 0x9a, 0x9b, 0x9b, 0x13, 0x63, 0x1d,
+ 0x7a, 0xb2, 0x67, 0x54, 0xd2, 0xe5, 0xb7, 0x1a, 0x20, 0x55, 0x2a, 0x73, 0xe5, 0xc7, 0xd0, 0xa6,
+ 0x92, 0x3b, 0xbe, 0x9f, 0x6c, 0x9b, 0xd5, 0xd8, 0x53, 0xb9, 0x35, 0x5b, 0x54, 0x65, 0xfa, 0x7f,
+ 0xb0, 0x21, 0x4f, 0xc6, 0xea, 0x87, 0xe5, 0xb3, 0x6f, 0x4a, 0x6b, 0x32, 0x96, 0x0c, 0xf7, 0x0a,
+ 0x5f, 0x9b, 0x8f, 0xc7, 0x5b, 0xdf, 0x57, 0x61, 0x75, 0x84, 0xed, 0xd7, 0x18, 0xbb, 0x68, 0x17,
+ 0xda, 0x23, 0x1c, 0xb8, 0xd9, 0xcf, 0x97, 0x0d, 0x65, 0xd3, 0x54, 0xda, 0xff, 0xd7, 0x22, 0x69,
+ 0x9a, 0x67, 0x57, 0x86, 0xda, 0x1d, 0x0d, 0xed, 0x43, 0xfb, 0x11, 0xc6, 0xd1, 0x76, 0x18, 0x04,
+ 0xd8, 0xa1, 0xd8, 0x45, 0xd7, 0xd4, 0x6c, 0x3f, 0xdf, 0x6a, 0xf7, 0x2f, 0xcf, 0x25, 0x9d, 0xa4,
+ 0x33, 0x93, 0x88, 0xcf, 0xa0, 0xa5, 0x76, 0x98, 0x39, 0xc0, 0x05, 0xfd, 0x70, 0xff, 0xfa, 0x92,
+ 0xd6, 0xd4, 0x58, 0x41, 0x77, 0xa1, 0x26, 0x5a, 0x1e, 0xa4, 0x2b, 0xc6, 0xb9, 0x9e, 0x2e, 0xe7,
+ 0x57, 0xbe, 0x3f, 0x32, 0x56, 0xd0, 0x23, 0x80, 0xac, 0x69, 0x40, 0x2a, 0x2f, 0x73, 0x5d, 0x4b,
+ 0xff, 0xea, 0x29, 0xda, 0x14, 0xec, 0x73, 0xe8, 0xe4, 0xcb, 0x27, 0x1a, 0x2c, 0xac, 0x90, 0x4a,
+ 0x0c, 0xf5, 0x6f, 0x9c, 0x61, 0x91, 0x02, 0x7f, 0x09, 0xdd, 0x62, 0x55, 0x44, 0xc6, 0xc2, 0x85,
+ 0xb9, 0x0a, 0xdb, 0xbf, 0x79, 0xa6, 0x8d, 0x4a, 0x42, 0x16, 0xc6, 0x39, 0x12, 0xe6, 0x62, 0x3e,
+ 0x47, 0xc2, 0x7c, 0xec, 0x1b, 0x2b, 0xe3, 0x1a, 0xff, 0x1d, 0xf8, 0xc1, 0xdf, 0x01, 0x00, 0x00,
+ 0xff, 0xff, 0xf2, 0x26, 0x88, 0x39, 0x1e, 0x14, 0x00, 0x00,
}
diff --git a/weed/server/volume_grpc_client_to_master.go b/weed/server/volume_grpc_client_to_master.go
index 6364cbc10..571c5716c 100644
--- a/weed/server/volume_grpc_client_to_master.go
+++ b/weed/server/volume_grpc_client_to_master.go
@@ -6,6 +6,7 @@ import (
"time"
"github.com/chrislusf/seaweedfs/weed/security"
+ "github.com/chrislusf/seaweedfs/weed/storage/erasure_coding"
"github.com/spf13/viper"
"google.golang.org/grpc"
@@ -121,7 +122,8 @@ func (vs *VolumeServer) doHeartbeat(ctx context.Context, masterNode, masterGrpcA
&ecShardMessage,
},
}
- glog.V(1).Infof("volume server %s:%d adds ec shard %d:%d", vs.store.Ip, vs.store.Port, ecShardMessage.Id, ecShardMessage.EcIndex)
+ glog.V(1).Infof("volume server %s:%d adds ec shard %d:%d", vs.store.Ip, vs.store.Port, ecShardMessage.Id,
+ erasure_coding.ShardBits(ecShardMessage.EcIndexBits).ShardIds())
if err = stream.Send(deltaBeat); err != nil {
glog.V(0).Infof("Volume Server Failed to update to master %s: %v", masterNode, err)
return "", err
@@ -143,7 +145,8 @@ func (vs *VolumeServer) doHeartbeat(ctx context.Context, masterNode, masterGrpcA
&ecShardMessage,
},
}
- glog.V(1).Infof("volume server %s:%d deletes ec shard %d:%d", vs.store.Ip, vs.store.Port, ecShardMessage.Id, ecShardMessage.EcIndex)
+ glog.V(1).Infof("volume server %s:%d deletes ec shard %d:%d", vs.store.Ip, vs.store.Port, ecShardMessage.Id,
+ erasure_coding.ShardBits(ecShardMessage.EcIndexBits).ShardIds())
if err = stream.Send(deltaBeat); err != nil {
glog.V(0).Infof("Volume Server Failed to update to master %s: %v", masterNode, err)
return "", err
diff --git a/weed/shell/command_volume_list.go b/weed/shell/command_volume_list.go
index 171f862c9..a402c1e51 100644
--- a/weed/shell/command_volume_list.go
+++ b/weed/shell/command_volume_list.go
@@ -4,6 +4,8 @@ import (
"context"
"fmt"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
+ "github.com/chrislusf/seaweedfs/weed/storage/erasure_coding"
+
"io"
"sort"
)
@@ -89,7 +91,7 @@ func writeDataNodeInfo(writer io.Writer, t *master_pb.DataNodeInfo) statistics {
s = s.plus(writeVolumeInformationMessage(writer, vi))
}
for _, ecShardInfo := range t.EcShardInfos {
- fmt.Fprintf(writer, " ec %+v \n", ecShardInfo)
+ fmt.Fprintf(writer, " ec volume id:%v collection:%v shards:%v\n", ecShardInfo.Id, ecShardInfo.Collection, erasure_coding.ShardBits(ecShardInfo.EcIndexBits).ShardIds())
}
fmt.Fprintf(writer, " DataNode %s %+v \n", t.Id, s)
return s
diff --git a/weed/storage/erasure_coding/ec_volume.go b/weed/storage/erasure_coding/ec_volume.go
index b6ba2c8aa..f10f62135 100644
--- a/weed/storage/erasure_coding/ec_volume.go
+++ b/weed/storage/erasure_coding/ec_volume.go
@@ -2,8 +2,10 @@ package erasure_coding
import (
"fmt"
+ "math"
"os"
"path"
+ "sort"
"strconv"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
@@ -44,6 +46,10 @@ func (shards *EcVolumeShards) AddEcVolumeShard(ecVolumeShard *EcVolumeShard) boo
}
}
*shards = append(*shards, ecVolumeShard)
+ sort.Slice(shards, func(i, j int) bool {
+ return (*shards)[i].VolumeId < (*shards)[j].VolumeId ||
+ (*shards)[i].VolumeId == (*shards)[j].VolumeId && (*shards)[i].ShardId < (*shards)[j].ShardId
+ })
return true
}
@@ -68,14 +74,19 @@ func (shards *EcVolumeShards) Close() {
}
}
-func (shards *EcVolumeShards) ToVolumeInformationMessage() (messages []*master_pb.VolumeEcShardInformationMessage) {
+func (shards *EcVolumeShards) ToVolumeEcShardInformationMessage() (messages []*master_pb.VolumeEcShardInformationMessage) {
+ prevVolumeId := needle.VolumeId(math.MaxUint32)
+ var m *master_pb.VolumeEcShardInformationMessage
for _, s := range *shards {
- m := &master_pb.VolumeEcShardInformationMessage{
- Id: uint32(s.VolumeId),
- Collection: s.Collection,
- EcIndex: uint32(s.ShardId),
+ if s.VolumeId != prevVolumeId {
+ m = &master_pb.VolumeEcShardInformationMessage{
+ Id: uint32(s.VolumeId),
+ Collection: s.Collection,
+ }
+ messages = append(messages, m)
}
- messages = append(messages, m)
+ prevVolumeId = s.VolumeId
+ m.EcIndexBits = uint32(ShardBits(m.EcIndexBits).AddShardId(s.ShardId))
}
return
}
diff --git a/weed/storage/erasure_coding/ec_volume_info.go b/weed/storage/erasure_coding/ec_volume_info.go
index cefc95173..c26269158 100644
--- a/weed/storage/erasure_coding/ec_volume_info.go
+++ b/weed/storage/erasure_coding/ec_volume_info.go
@@ -1,8 +1,6 @@
package erasure_coding
import (
- "fmt"
-
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/storage/needle"
)
@@ -11,59 +9,74 @@ import (
type EcVolumeInfo struct {
VolumeId needle.VolumeId
Collection string
- shardIds uint16 // use bits to indicate the shard id
+ ShardBits ShardBits
}
-func NewEcVolumeInfo(collection string, vid needle.VolumeId) *EcVolumeInfo {
+func NewEcVolumeInfo(collection string, vid needle.VolumeId, shardBits ShardBits) *EcVolumeInfo {
return &EcVolumeInfo{
Collection: collection,
VolumeId: vid,
+ ShardBits: shardBits,
}
}
func (ecInfo *EcVolumeInfo) AddShardId(id ShardId) {
- ecInfo.shardIds |= (1 << id)
+ ecInfo.ShardBits = ecInfo.ShardBits.AddShardId(id)
}
func (ecInfo *EcVolumeInfo) RemoveShardId(id ShardId) {
- ecInfo.shardIds &^= (1 << id)
+ ecInfo.ShardBits = ecInfo.ShardBits.RemoveShardId(id)
}
func (ecInfo *EcVolumeInfo) HasShardId(id ShardId) bool {
- return ecInfo.shardIds&(1<<id) > 0
+ return ecInfo.ShardBits.HasShardId(id)
}
func (ecInfo *EcVolumeInfo) ShardIds() (ret []ShardId) {
- for i := ShardId(0); i < DataShardsCount+ParityShardsCount; i++ {
- if ecInfo.HasShardId(i) {
- ret = append(ret, i)
- }
- }
- return
+ return ecInfo.ShardBits.ShardIds()
}
func (ecInfo *EcVolumeInfo) Minus(other *EcVolumeInfo) (*EcVolumeInfo) {
ret := &EcVolumeInfo{
VolumeId: ecInfo.VolumeId,
Collection: ecInfo.Collection,
- shardIds: ecInfo.shardIds &^ other.shardIds,
+ ShardBits: ecInfo.ShardBits.Minus(other.ShardBits),
}
return ret
}
-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,
- })
+func (ecInfo *EcVolumeInfo) ToVolumeEcShardInformationMessage() (ret *master_pb.VolumeEcShardInformationMessage) {
+ return &master_pb.VolumeEcShardInformationMessage{
+ Id: uint32(ecInfo.VolumeId),
+ EcIndexBits: uint32(ecInfo.ShardBits),
+ Collection: ecInfo.Collection,
+ }
+}
+
+type ShardBits uint32 // use bits to indicate the shard id, use 32 bits just for possible future extension
+func (b ShardBits) AddShardId(id ShardId) ShardBits {
+ return b | (1 << id)
+}
+
+func (b ShardBits) RemoveShardId(id ShardId) ShardBits {
+ return b &^ (1 << id)
+}
+
+func (b ShardBits) HasShardId(id ShardId) bool {
+ return b&(1<<id) > 0
+}
+
+func (b ShardBits) ShardIds() (ret []ShardId) {
+ for i := ShardId(0); i < DataShardsCount+ParityShardsCount; i++ {
+ if b.HasShardId(i) {
+ ret = append(ret, i)
+ }
}
return
}
-func (ecInfo *EcVolumeInfo) String() string {
- return fmt.Sprintf("id:%d shard:%v collection:%v", ecInfo.VolumeId, ecInfo.ShardIds(), ecInfo.Collection)
+func (b ShardBits) Minus(other ShardBits) (ShardBits) {
+ return b &^ other
}
diff --git a/weed/storage/store_ec.go b/weed/storage/store_ec.go
index 43d851faa..241adb24e 100644
--- a/weed/storage/store_ec.go
+++ b/weed/storage/store_ec.go
@@ -9,7 +9,7 @@ func (s *Store) CollectErasureCodingHeartbeat() *master_pb.Heartbeat {
for _, location := range s.Locations {
location.ecShardsLock.RLock()
for _, ecShards := range location.ecShards {
- ecShardMessages = append(ecShardMessages, ecShards.ToVolumeInformationMessage()...)
+ ecShardMessages = append(ecShardMessages, ecShards.ToVolumeEcShardInformationMessage()...)
}
location.ecShardsLock.RUnlock()
}
diff --git a/weed/topology/data_node.go b/weed/topology/data_node.go
index dba323518..5edc9c580 100644
--- a/weed/topology/data_node.go
+++ b/weed/topology/data_node.go
@@ -164,7 +164,7 @@ func (dn *DataNode) ToDataNodeInfo() *master_pb.DataNodeInfo {
m.VolumeInfos = append(m.VolumeInfos, v.ToVolumeInformationMessage())
}
for _, ecv := range dn.GetEcShards() {
- m.EcShardInfos = append(m.EcShardInfos, ecv.ToVolumeEcShardInformationMessage()...)
+ m.EcShardInfos = append(m.EcShardInfos, ecv.ToVolumeEcShardInformationMessage())
}
return m
}
diff --git a/weed/topology/topology_ec.go b/weed/topology/topology_ec.go
index 379440684..eb52b44b4 100644
--- a/weed/topology/topology_ec.go
+++ b/weed/topology/topology_ec.go
@@ -1,9 +1,6 @@
package topology
import (
- "math"
- "sort"
-
"github.com/chrislusf/seaweedfs/weed/glog"
"github.com/chrislusf/seaweedfs/weed/pb/master_pb"
"github.com/chrislusf/seaweedfs/weed/storage/erasure_coding"
@@ -20,18 +17,12 @@ type EcShardLocations struct {
func (t *Topology) SyncDataNodeEcShards(shardInfos []*master_pb.VolumeEcShardInformationMessage, dn *DataNode) (newShards, deletedShards []*erasure_coding.EcVolumeInfo) {
// convert into in memory struct storage.VolumeInfo
var shards []*erasure_coding.EcVolumeInfo
- sort.Slice(shardInfos, func(i, j int) bool {
- return shardInfos[i].Id < shardInfos[j].Id
- })
- prevVolumeId := uint32(math.MaxUint32)
- var ecVolumeInfo *erasure_coding.EcVolumeInfo
for _, shardInfo := range shardInfos {
- if shardInfo.Id != prevVolumeId {
- ecVolumeInfo = erasure_coding.NewEcVolumeInfo(shardInfo.Collection, needle.VolumeId(shardInfo.Id))
- shards = append(shards, ecVolumeInfo)
- }
- prevVolumeId = shardInfo.Id
- ecVolumeInfo.AddShardId(erasure_coding.ShardId(shardInfo.EcIndex))
+ shards = append(shards,
+ erasure_coding.NewEcVolumeInfo(
+ shardInfo.Collection,
+ needle.VolumeId(shardInfo.Id),
+ erasure_coding.ShardBits(shardInfo.EcIndexBits)))
}
// find out the delta volumes
newShards, deletedShards = dn.UpdateEcShards(shards)
generated by cgit v1.2.3 (git 2.25.1) at 2025-12-21 20:33:44 +0000