diff --git a/weed/pb/master.proto b/weed/pb/master.proto index d39dc8723..7fdd45469 100644 --- a/weed/pb/master.proto +++ b/weed/pb/master.proto @@ -74,6 +74,8 @@ message VolumeInformationMessage { uint32 ttl = 10; uint32 compact_revision = 11; int64 modified_at_second = 12; + string remote_storage_name = 13; + string remote_storage_key = 14; } message VolumeShortInformationMessage { diff --git a/weed/pb/master_pb/master.pb.go b/weed/pb/master_pb/master.pb.go index cf86c7ce7..a01fb0a1f 100644 --- a/weed/pb/master_pb/master.pb.go +++ b/weed/pb/master_pb/master.pb.go @@ -253,18 +253,20 @@ func (m *HeartbeatResponse) GetStorageBackends() []*StorageBackend { } type VolumeInformationMessage struct { - Id uint32 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"` - Size uint64 `protobuf:"varint,2,opt,name=size" json:"size,omitempty"` - Collection string `protobuf:"bytes,3,opt,name=collection" json:"collection,omitempty"` - FileCount uint64 `protobuf:"varint,4,opt,name=file_count,json=fileCount" json:"file_count,omitempty"` - DeleteCount uint64 `protobuf:"varint,5,opt,name=delete_count,json=deleteCount" json:"delete_count,omitempty"` - DeletedByteCount uint64 `protobuf:"varint,6,opt,name=deleted_byte_count,json=deletedByteCount" json:"deleted_byte_count,omitempty"` - ReadOnly bool `protobuf:"varint,7,opt,name=read_only,json=readOnly" json:"read_only,omitempty"` - ReplicaPlacement uint32 `protobuf:"varint,8,opt,name=replica_placement,json=replicaPlacement" json:"replica_placement,omitempty"` - Version uint32 `protobuf:"varint,9,opt,name=version" json:"version,omitempty"` - Ttl uint32 `protobuf:"varint,10,opt,name=ttl" json:"ttl,omitempty"` - CompactRevision uint32 `protobuf:"varint,11,opt,name=compact_revision,json=compactRevision" json:"compact_revision,omitempty"` - ModifiedAtSecond int64 `protobuf:"varint,12,opt,name=modified_at_second,json=modifiedAtSecond" json:"modified_at_second,omitempty"` + Id uint32 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"` + Size uint64 `protobuf:"varint,2,opt,name=size" json:"size,omitempty"` + Collection string `protobuf:"bytes,3,opt,name=collection" json:"collection,omitempty"` + FileCount uint64 `protobuf:"varint,4,opt,name=file_count,json=fileCount" json:"file_count,omitempty"` + DeleteCount uint64 `protobuf:"varint,5,opt,name=delete_count,json=deleteCount" json:"delete_count,omitempty"` + DeletedByteCount uint64 `protobuf:"varint,6,opt,name=deleted_byte_count,json=deletedByteCount" json:"deleted_byte_count,omitempty"` + ReadOnly bool `protobuf:"varint,7,opt,name=read_only,json=readOnly" json:"read_only,omitempty"` + ReplicaPlacement uint32 `protobuf:"varint,8,opt,name=replica_placement,json=replicaPlacement" json:"replica_placement,omitempty"` + Version uint32 `protobuf:"varint,9,opt,name=version" json:"version,omitempty"` + Ttl uint32 `protobuf:"varint,10,opt,name=ttl" json:"ttl,omitempty"` + CompactRevision uint32 `protobuf:"varint,11,opt,name=compact_revision,json=compactRevision" json:"compact_revision,omitempty"` + ModifiedAtSecond int64 `protobuf:"varint,12,opt,name=modified_at_second,json=modifiedAtSecond" json:"modified_at_second,omitempty"` + RemoteStorageName string `protobuf:"bytes,13,opt,name=remote_storage_name,json=remoteStorageName" json:"remote_storage_name,omitempty"` + RemoteStorageKey string `protobuf:"bytes,14,opt,name=remote_storage_key,json=remoteStorageKey" json:"remote_storage_key,omitempty"` } func (m *VolumeInformationMessage) Reset() { *m = VolumeInformationMessage{} } @@ -356,6 +358,20 @@ func (m *VolumeInformationMessage) GetModifiedAtSecond() int64 { return 0 } +func (m *VolumeInformationMessage) GetRemoteStorageName() string { + if m != nil { + return m.RemoteStorageName + } + return "" +} + +func (m *VolumeInformationMessage) GetRemoteStorageKey() string { + if m != nil { + return m.RemoteStorageKey + } + return "" +} + type VolumeShortInformationMessage struct { Id uint32 `protobuf:"varint,1,opt,name=id" json:"id,omitempty"` Collection string `protobuf:"bytes,3,opt,name=collection" json:"collection,omitempty"` @@ -1859,133 +1875,136 @@ var _Seaweed_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("master.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 2048 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x59, 0x4f, 0x6f, 0xdc, 0xc6, - 0x15, 0x37, 0xa9, 0xd5, 0x6a, 0xf7, 0xed, 0xff, 0x91, 0xac, 0xac, 0x37, 0x71, 0xb4, 0x66, 0x0a, - 0x44, 0x76, 0x53, 0x35, 0x55, 0x02, 0x34, 0x68, 0x1b, 0x04, 0xb6, 0xac, 0xa4, 0x82, 0x2d, 0xc7, - 0xa6, 0x5c, 0x07, 0x28, 0x50, 0xb0, 0xb3, 0xe4, 0x48, 0x22, 0xc4, 0x25, 0x59, 0xce, 0xac, 0xac, - 0x4d, 0x2f, 0x05, 0xda, 0x5b, 0x81, 0x5e, 0x7a, 0xe8, 0xa9, 0xf7, 0xde, 0x7b, 0xef, 0xa5, 0x1f, - 0xa2, 0xe7, 0x7e, 0x85, 0x5e, 0x8b, 0x02, 0xc5, 0xfc, 0x23, 0x87, 0xdc, 0x95, 0x14, 0x05, 0xc8, - 0xc1, 0x37, 0xce, 0x7b, 0x6f, 0xde, 0xbc, 0xf9, 0xbd, 0x79, 0x6f, 0x7e, 0xb3, 0x0b, 0xed, 0x29, - 0xa6, 0x8c, 0x64, 0x3b, 0x69, 0x96, 0xb0, 0x04, 0x35, 0xe5, 0xc8, 0x4b, 0x27, 0xce, 0x1f, 0xeb, - 0xd0, 0xfc, 0x39, 0xc1, 0x19, 0x9b, 0x10, 0xcc, 0x50, 0x17, 0xec, 0x30, 0x1d, 0x5a, 0x63, 0x6b, - 0xbb, 0xe9, 0xda, 0x61, 0x8a, 0x10, 0xd4, 0xd2, 0x24, 0x63, 0x43, 0x7b, 0x6c, 0x6d, 0x77, 0x5c, - 0xf1, 0x8d, 0xee, 0x02, 0xa4, 0xb3, 0x49, 0x14, 0xfa, 0xde, 0x2c, 0x8b, 0x86, 0x2b, 0xc2, 0xb6, - 0x29, 0x25, 0xbf, 0xc8, 0x22, 0xb4, 0x0d, 0xfd, 0x29, 0xbe, 0xf0, 0xce, 0x93, 0x68, 0x36, 0x25, - 0x9e, 0x9f, 0xcc, 0x62, 0x36, 0xac, 0x89, 0xe9, 0xdd, 0x29, 0xbe, 0x78, 0x25, 0xc4, 0x7b, 0x5c, - 0x8a, 0xc6, 0x3c, 0xaa, 0x0b, 0xef, 0x38, 0x8c, 0x88, 0x77, 0x46, 0xe6, 0xc3, 0xd5, 0xb1, 0xb5, - 0x5d, 0x73, 0x61, 0x8a, 0x2f, 0x3e, 0x0f, 0x23, 0xf2, 0x84, 0xcc, 0xd1, 0x16, 0xb4, 0x02, 0xcc, - 0xb0, 0xe7, 0x93, 0x98, 0x91, 0x6c, 0x58, 0x17, 0x6b, 0x01, 0x17, 0xed, 0x09, 0x09, 0x8f, 0x2f, - 0xc3, 0xfe, 0xd9, 0x70, 0x4d, 0x68, 0xc4, 0x37, 0x8f, 0x0f, 0x07, 0xd3, 0x30, 0xf6, 0x44, 0xe4, - 0x0d, 0xb1, 0x74, 0x53, 0x48, 0x9e, 0xf3, 0xf0, 0x3f, 0x85, 0x35, 0x19, 0x1b, 0x1d, 0x36, 0xc7, - 0x2b, 0xdb, 0xad, 0xdd, 0xf7, 0x76, 0x72, 0x34, 0x76, 0x64, 0x78, 0x07, 0xf1, 0x71, 0x92, 0x4d, - 0x31, 0x0b, 0x93, 0xf8, 0x90, 0x50, 0x8a, 0x4f, 0x88, 0xab, 0xe7, 0xa0, 0x03, 0x68, 0xc5, 0xe4, - 0xb5, 0xa7, 0x5d, 0x80, 0x70, 0xb1, 0xbd, 0xe0, 0xe2, 0xe8, 0x34, 0xc9, 0xd8, 0x12, 0x3f, 0x10, - 0x93, 0xd7, 0xaf, 0x94, 0xab, 0x17, 0xd0, 0x0b, 0x48, 0x44, 0x18, 0x09, 0x72, 0x77, 0xad, 0x1b, - 0xba, 0xeb, 0x2a, 0x07, 0xda, 0xe5, 0xf7, 0xa0, 0x7b, 0x8a, 0xa9, 0x17, 0x27, 0xb9, 0xc7, 0xf6, - 0xd8, 0xda, 0x6e, 0xb8, 0xed, 0x53, 0x4c, 0x9f, 0x25, 0xda, 0xea, 0x0b, 0x68, 0x12, 0xdf, 0xa3, - 0xa7, 0x38, 0x0b, 0xe8, 0xb0, 0x2f, 0x96, 0x7c, 0xb0, 0xb0, 0xe4, 0xbe, 0x7f, 0xc4, 0x0d, 0x96, - 0x2c, 0xda, 0x20, 0x52, 0x45, 0xd1, 0x33, 0xe8, 0x70, 0x30, 0x0a, 0x67, 0x83, 0x1b, 0x3b, 0xe3, - 0x68, 0xee, 0x6b, 0x7f, 0xaf, 0x60, 0xa0, 0x11, 0x29, 0x7c, 0xa2, 0x1b, 0xfb, 0xd4, 0xb0, 0xe6, - 0x7e, 0xdf, 0x87, 0xbe, 0x82, 0xa5, 0x70, 0xbb, 0x2e, 0x80, 0xe9, 0x08, 0x60, 0xb4, 0xa1, 0xf3, - 0x3b, 0x1b, 0x06, 0x79, 0x35, 0xb8, 0x84, 0xa6, 0x49, 0x4c, 0x09, 0x7a, 0x00, 0x03, 0x75, 0x9c, - 0x69, 0xf8, 0x35, 0xf1, 0xa2, 0x70, 0x1a, 0x32, 0x51, 0x24, 0x35, 0xb7, 0x27, 0x15, 0x47, 0xe1, - 0xd7, 0xe4, 0x29, 0x17, 0xa3, 0x4d, 0xa8, 0x47, 0x04, 0x07, 0x24, 0x13, 0x35, 0xd3, 0x74, 0xd5, - 0x08, 0xbd, 0x0f, 0xbd, 0x29, 0x61, 0x59, 0xe8, 0x53, 0x0f, 0x07, 0x41, 0x46, 0x28, 0x55, 0xa5, - 0xd3, 0x55, 0xe2, 0x87, 0x52, 0x8a, 0x3e, 0x81, 0xa1, 0x36, 0x0c, 0xf9, 0x19, 0x3f, 0xc7, 0x91, - 0x47, 0x89, 0x9f, 0xc4, 0x01, 0x55, 0x75, 0xb4, 0xa9, 0xf4, 0x07, 0x4a, 0x7d, 0x24, 0xb5, 0xe8, - 0x31, 0xf4, 0x29, 0x4b, 0x32, 0x7c, 0x42, 0xbc, 0x09, 0xf6, 0xcf, 0x08, 0x9f, 0xb1, 0x2a, 0xc0, - 0xbb, 0x63, 0x80, 0x77, 0x24, 0x4d, 0x1e, 0x49, 0x0b, 0xb7, 0x47, 0x4b, 0x63, 0xea, 0xfc, 0x75, - 0x05, 0x86, 0x97, 0x95, 0x81, 0xe8, 0x0f, 0x81, 0xd8, 0x7a, 0xc7, 0xb5, 0xc3, 0x80, 0xd7, 0x1f, - 0x87, 0x44, 0xec, 0xb5, 0xe6, 0x8a, 0x6f, 0xf4, 0x2e, 0x80, 0x9f, 0x44, 0x11, 0xf1, 0xf9, 0x44, - 0xb5, 0x49, 0x43, 0xc2, 0xeb, 0x53, 0x94, 0x7c, 0xd1, 0x1a, 0x6a, 0x6e, 0x93, 0x4b, 0x64, 0x57, - 0xb8, 0x07, 0x6d, 0x99, 0x3e, 0x65, 0x20, 0xbb, 0x42, 0x4b, 0xca, 0xa4, 0xc9, 0x07, 0x80, 0xf4, - 0x31, 0x99, 0xcc, 0x73, 0xc3, 0xba, 0x30, 0xec, 0x2b, 0xcd, 0xa3, 0xb9, 0xb6, 0x7e, 0x1b, 0x9a, - 0x19, 0xc1, 0x81, 0x97, 0xc4, 0xd1, 0x5c, 0x34, 0x8a, 0x86, 0xdb, 0xe0, 0x82, 0x2f, 0xe3, 0x68, - 0x8e, 0xbe, 0x0f, 0x83, 0x8c, 0xa4, 0x51, 0xe8, 0x63, 0x2f, 0x8d, 0xb0, 0x4f, 0xa6, 0x24, 0xd6, - 0x3d, 0xa3, 0xaf, 0x14, 0xcf, 0xb5, 0x1c, 0x0d, 0x61, 0xed, 0x9c, 0x64, 0x94, 0x6f, 0xab, 0x29, - 0x4c, 0xf4, 0x10, 0xf5, 0x61, 0x85, 0xb1, 0x68, 0x08, 0x42, 0xca, 0x3f, 0xd1, 0x7d, 0xe8, 0xfb, - 0xc9, 0x34, 0xc5, 0x3e, 0xf3, 0x32, 0x72, 0x1e, 0x8a, 0x49, 0x2d, 0xa1, 0xee, 0x29, 0xb9, 0xab, - 0xc4, 0x7c, 0x3b, 0xd3, 0x24, 0x08, 0x8f, 0x43, 0x12, 0x78, 0x98, 0xa9, 0x64, 0x8b, 0xc2, 0x5d, - 0x71, 0xfb, 0x5a, 0xf3, 0x90, 0xc9, 0x34, 0x3b, 0x7f, 0xb3, 0xe0, 0xee, 0x95, 0x4d, 0x61, 0x21, - 0x49, 0xd7, 0x25, 0xe4, 0xbb, 0xc2, 0xc0, 0x99, 0xc1, 0xd6, 0x35, 0xa5, 0x7a, 0x4d, 0xac, 0xf6, - 0x42, 0xac, 0x0e, 0x74, 0x88, 0xef, 0x85, 0x71, 0x40, 0x2e, 0xbc, 0x49, 0xc8, 0x64, 0x11, 0x75, - 0xdc, 0x16, 0xf1, 0x0f, 0xb8, 0xec, 0x51, 0xc8, 0xa8, 0xf3, 0x0f, 0x0b, 0xba, 0xe5, 0x53, 0xce, - 0xcf, 0x29, 0x9b, 0xa7, 0x44, 0xdd, 0x6c, 0xe2, 0x5b, 0x2d, 0x6d, 0xab, 0xbb, 0x2e, 0x40, 0x07, - 0x00, 0x69, 0x96, 0xa4, 0x24, 0x63, 0x21, 0xe1, 0x7e, 0x79, 0xe1, 0xdc, 0xbf, 0xb4, 0x70, 0x76, - 0x9e, 0xe7, 0xb6, 0xfb, 0x31, 0xcb, 0xe6, 0xae, 0x31, 0x79, 0xf4, 0x29, 0xf4, 0x2a, 0x6a, 0x8e, - 0x0e, 0xbf, 0xe3, 0x64, 0x00, 0xfc, 0x13, 0x6d, 0xc0, 0xea, 0x39, 0x8e, 0x66, 0x44, 0x85, 0x20, - 0x07, 0x3f, 0xb1, 0x3f, 0xb1, 0x9c, 0x35, 0x58, 0xdd, 0x9f, 0xa6, 0x6c, 0xce, 0x77, 0xd2, 0x3b, - 0x9a, 0xa5, 0x24, 0x7b, 0x14, 0x25, 0xfe, 0xd9, 0xfe, 0x05, 0xcb, 0x30, 0xfa, 0x12, 0xba, 0x24, - 0xc3, 0x74, 0x96, 0xf1, 0x73, 0x1f, 0x84, 0xf1, 0x89, 0xf0, 0x59, 0xbe, 0x34, 0x2a, 0x73, 0x76, - 0xf6, 0xe5, 0x84, 0x3d, 0x61, 0xef, 0x76, 0x88, 0x39, 0x1c, 0xfd, 0x12, 0x3a, 0x25, 0x3d, 0x07, - 0x8b, 0x5f, 0xb1, 0x2a, 0x2b, 0xe2, 0x9b, 0xb7, 0xb5, 0x14, 0x67, 0x21, 0x9b, 0x2b, 0x2a, 0xa0, - 0x46, 0xbc, 0x98, 0x55, 0x6b, 0x0c, 0x03, 0x09, 0x5a, 0xc7, 0x6d, 0x4a, 0xc9, 0x41, 0x40, 0x9d, - 0x07, 0xb0, 0xf1, 0x84, 0x90, 0x74, 0x2f, 0x89, 0x63, 0xe2, 0x33, 0x12, 0xb8, 0xe4, 0x37, 0x33, - 0x42, 0x19, 0x5f, 0x22, 0xc6, 0xd3, 0x3c, 0x1f, 0xfc, 0xdb, 0xf9, 0x8b, 0x05, 0x5d, 0x79, 0x5c, - 0x9e, 0x26, 0xbe, 0x38, 0x24, 0x1c, 0x34, 0xce, 0x31, 0x14, 0x68, 0xb3, 0x2c, 0xaa, 0x90, 0x0f, - 0xbb, 0x4a, 0x3e, 0xee, 0x40, 0x43, 0xdc, 0xce, 0x45, 0x30, 0x6b, 0xfc, 0xc2, 0x0d, 0x03, 0x5a, - 0xf4, 0x95, 0x40, 0xaa, 0x6b, 0x42, 0xdd, 0xd2, 0x17, 0x28, 0x37, 0x29, 0x7a, 0xf7, 0xaa, 0xd9, - 0xbb, 0x9d, 0x97, 0xb0, 0xfe, 0x34, 0x49, 0xce, 0x66, 0xa9, 0x0c, 0x4f, 0x6f, 0xa2, 0xbc, 0x77, - 0x6b, 0xbc, 0xc2, 0x63, 0xc9, 0xf7, 0x7e, 0xdd, 0x51, 0x76, 0xfe, 0x63, 0xc1, 0x46, 0xd9, 0xad, - 0xba, 0x6e, 0x7e, 0x0d, 0xeb, 0xb9, 0x5f, 0x2f, 0x52, 0x58, 0xc8, 0x05, 0x5a, 0xbb, 0x1f, 0x1a, - 0x69, 0x5e, 0x36, 0x5b, 0x53, 0x98, 0x40, 0x83, 0xe8, 0x0e, 0xce, 0x2b, 0x12, 0x3a, 0xba, 0x80, - 0x7e, 0xd5, 0x8c, 0xb7, 0xc9, 0x7c, 0x55, 0x85, 0x78, 0x43, 0xcf, 0x44, 0x3f, 0x82, 0x66, 0x11, - 0x88, 0x2d, 0x02, 0x59, 0x2f, 0x05, 0xa2, 0xd6, 0x2a, 0xac, 0xf8, 0xf1, 0x26, 0x59, 0x96, 0x64, - 0xaa, 0xe1, 0xc8, 0x81, 0xf3, 0x53, 0x68, 0x7c, 0xeb, 0xec, 0x3a, 0x7f, 0xb7, 0xa1, 0xf3, 0x90, - 0xd2, 0xf0, 0x24, 0xd6, 0x29, 0xd8, 0x80, 0x55, 0xd9, 0xfc, 0xe5, 0x6d, 0x2c, 0x07, 0x68, 0x0c, - 0x2d, 0xd5, 0xb7, 0x0c, 0xe8, 0x4d, 0xd1, 0xb5, 0x2d, 0x51, 0xf5, 0xb2, 0x9a, 0x0c, 0x8d, 0xf7, - 0xf3, 0x0a, 0x15, 0x5d, 0xbd, 0x94, 0x8a, 0xd6, 0x0d, 0x2a, 0xfa, 0x36, 0x34, 0xc5, 0xa4, 0x38, - 0x09, 0x88, 0xe2, 0xa8, 0x0d, 0x2e, 0x78, 0x96, 0x04, 0x04, 0xed, 0xc2, 0xe6, 0x94, 0x4c, 0x93, - 0x6c, 0xee, 0x4d, 0x71, 0xea, 0x71, 0x26, 0x2c, 0xd8, 0xc5, 0x74, 0xa2, 0x7a, 0x2f, 0x92, 0xda, - 0x43, 0x9c, 0x1e, 0xe2, 0x0b, 0x4e, 0x30, 0x0e, 0x27, 0x68, 0x17, 0x6e, 0x7f, 0x95, 0x85, 0x0c, - 0x4f, 0x22, 0x52, 0x66, 0xd8, 0xb2, 0x17, 0xaf, 0x6b, 0xa5, 0x41, 0xb3, 0x9d, 0x3f, 0x5b, 0xd0, - 0xd5, 0xa8, 0xa9, 0x13, 0xd6, 0x87, 0x95, 0xe3, 0x3c, 0xcb, 0xfc, 0x53, 0xe7, 0xc2, 0xbe, 0x2c, - 0x17, 0x0b, 0x34, 0x3f, 0x47, 0xbe, 0x66, 0x22, 0x9f, 0x27, 0x7d, 0xd5, 0x48, 0x3a, 0x87, 0x06, - 0xcf, 0xd8, 0xa9, 0x86, 0x86, 0x7f, 0x3b, 0x27, 0x30, 0x38, 0x62, 0x98, 0x85, 0x94, 0x85, 0x3e, - 0xd5, 0xe9, 0xac, 0x24, 0xce, 0xba, 0x2e, 0x71, 0xf6, 0x65, 0x89, 0x5b, 0xc9, 0x13, 0xe7, 0xfc, - 0xd3, 0x02, 0x64, 0xae, 0xa4, 0x20, 0xf8, 0x0e, 0x96, 0xe2, 0x90, 0xb1, 0x84, 0x71, 0xbe, 0xc6, - 0x39, 0x91, 0x62, 0x36, 0x42, 0xc2, 0xd3, 0xc7, 0x4f, 0xc3, 0x8c, 0x92, 0x40, 0x6a, 0x25, 0xad, - 0x69, 0x70, 0x81, 0x50, 0x96, 0x59, 0x51, 0xbd, 0xc2, 0x8a, 0x9c, 0x87, 0xd0, 0x52, 0xf7, 0xcf, - 0x4b, 0x7e, 0x77, 0x5d, 0x1f, 0xbd, 0x8a, 0xce, 0x2e, 0x80, 0x18, 0x03, 0xec, 0x15, 0xd1, 0x2f, - 0xeb, 0xc0, 0xbf, 0x85, 0xdb, 0x85, 0xc5, 0xd3, 0x90, 0x32, 0x9d, 0x97, 0x8f, 0x61, 0x33, 0x8c, - 0xfd, 0x68, 0x16, 0x10, 0x2f, 0xe6, 0x37, 0x78, 0x94, 0x3f, 0x2f, 0x2c, 0xc1, 0xa7, 0x36, 0x94, - 0xf6, 0x99, 0x50, 0xea, 0x67, 0xc6, 0x07, 0x80, 0xf4, 0x2c, 0xe2, 0xe7, 0x33, 0x6c, 0x31, 0xa3, - 0xaf, 0x34, 0xfb, 0xbe, 0xb2, 0x76, 0x5e, 0xc0, 0x66, 0x75, 0x71, 0x95, 0xaa, 0x1f, 0x43, 0xab, - 0x80, 0x5d, 0xf7, 0xc1, 0xdb, 0x46, 0xfb, 0x29, 0xe6, 0xb9, 0xa6, 0xa5, 0xf3, 0x03, 0x78, 0xab, - 0x50, 0x3d, 0x16, 0x8d, 0xfe, 0xaa, 0x0b, 0x68, 0x04, 0xc3, 0x45, 0x73, 0x19, 0x83, 0xf3, 0x6f, - 0x1b, 0xda, 0x8f, 0x55, 0xe5, 0x72, 0x1a, 0x63, 0x10, 0x17, 0xc9, 0x1e, 0xee, 0x41, 0xbb, 0x54, - 0x90, 0x92, 0x11, 0xb7, 0xce, 0x8d, 0xf7, 0xee, 0xb2, 0x97, 0xf1, 0x8a, 0x30, 0xab, 0xbe, 0x8c, - 0x1f, 0xc0, 0xe0, 0x38, 0x23, 0x64, 0xf1, 0x11, 0x5d, 0x73, 0x7b, 0x5c, 0x61, 0xda, 0xee, 0xc0, - 0x3a, 0xf6, 0x59, 0x78, 0x5e, 0xb1, 0x96, 0xe7, 0x6b, 0x20, 0x55, 0xa6, 0xfd, 0xe7, 0x79, 0xa0, - 0x61, 0x7c, 0x9c, 0xd0, 0x61, 0xfd, 0x9b, 0x3f, 0x82, 0xd5, 0x6e, 0xb8, 0x86, 0xa2, 0xe7, 0xd0, - 0xd5, 0x8f, 0x29, 0xe5, 0x69, 0xed, 0xc6, 0x0f, 0xb5, 0x36, 0x29, 0x54, 0xd4, 0xf9, 0x83, 0x0d, - 0x0d, 0x17, 0xfb, 0x67, 0x6f, 0x36, 0xbe, 0x9f, 0x41, 0x2f, 0xef, 0xf9, 0x25, 0x88, 0xdf, 0x32, - 0x80, 0x31, 0x8f, 0x92, 0xdb, 0x09, 0x8c, 0x11, 0x75, 0xfe, 0x67, 0x41, 0xf7, 0x71, 0x7e, 0xaf, - 0xbc, 0xd9, 0x60, 0xec, 0x02, 0xf0, 0x8b, 0xb0, 0x84, 0x83, 0x49, 0x1c, 0x74, 0xba, 0xdd, 0x66, - 0xa6, 0xbe, 0xa8, 0xf3, 0x27, 0x1b, 0xda, 0x2f, 0x93, 0x34, 0x89, 0x92, 0x93, 0xf9, 0x9b, 0xbd, - 0xfb, 0x7d, 0x18, 0x18, 0x9c, 0xa1, 0x04, 0xc2, 0x9d, 0xca, 0x61, 0x28, 0x92, 0xed, 0xf6, 0x82, - 0xd2, 0x98, 0x3a, 0xeb, 0x30, 0x50, 0xbc, 0xb8, 0x68, 0xc9, 0xce, 0xef, 0x2d, 0x40, 0xa6, 0x54, - 0xf5, 0xca, 0x9f, 0x41, 0x87, 0x29, 0xec, 0xc4, 0x7a, 0xea, 0x71, 0x60, 0x9e, 0x3d, 0x13, 0x5b, - 0xb7, 0xcd, 0x4c, 0xa4, 0x7f, 0x08, 0x1b, 0x0b, 0x3f, 0x74, 0x70, 0x42, 0x22, 0x11, 0x1e, 0x54, - 0x7e, 0xeb, 0x38, 0x9c, 0x38, 0x1f, 0xc3, 0x6d, 0x49, 0x42, 0x75, 0x1f, 0xd7, 0xfd, 0x75, 0x81, - 0x4d, 0x76, 0x0a, 0x36, 0xe9, 0xfc, 0xd7, 0x82, 0xcd, 0xea, 0x34, 0x15, 0xff, 0x55, 0xf3, 0x10, - 0x06, 0xa4, 0xfa, 0x8d, 0xc9, 0x8b, 0x25, 0x1d, 0xfd, 0x68, 0x81, 0x17, 0x57, 0x7d, 0xef, 0xe8, - 0x3e, 0x54, 0x50, 0xe3, 0x3e, 0x2d, 0x0b, 0xe8, 0x08, 0xc3, 0x60, 0xc1, 0x8c, 0xbf, 0x2a, 0xf4, - 0xba, 0x2a, 0xa6, 0x35, 0x35, 0xf1, 0x5b, 0x10, 0x63, 0x67, 0x0b, 0xee, 0x7e, 0x41, 0xd8, 0xa1, - 0xb0, 0xd9, 0x4b, 0xe2, 0xe3, 0xf0, 0x64, 0x96, 0x49, 0xa3, 0x22, 0xb5, 0xef, 0x5e, 0x66, 0xa1, - 0x60, 0x5a, 0xf2, 0x6b, 0x92, 0x75, 0xe3, 0x5f, 0x93, 0xec, 0xab, 0x7e, 0x4d, 0xda, 0xfd, 0x57, - 0x1d, 0xd6, 0x8e, 0x08, 0x7e, 0x4d, 0x08, 0x7f, 0x1a, 0x77, 0x8e, 0x48, 0x1c, 0x14, 0xbf, 0x13, - 0x6f, 0x18, 0x7b, 0xcc, 0xa5, 0xa3, 0x77, 0x96, 0x49, 0xf3, 0x2b, 0xf4, 0xd6, 0xb6, 0xf5, 0xa1, - 0x85, 0x5e, 0x40, 0xa7, 0xf4, 0x22, 0x44, 0x5b, 0xc6, 0xa4, 0x65, 0x6f, 0xc5, 0xd1, 0x9d, 0x85, - 0x0b, 0x45, 0xa3, 0x9a, 0xbb, 0x6c, 0x9b, 0x2f, 0x21, 0xf4, 0xee, 0xa5, 0x4f, 0x24, 0xe9, 0x70, - 0xeb, 0x9a, 0x27, 0x94, 0x73, 0x0b, 0x7d, 0x06, 0x75, 0x49, 0x99, 0xd1, 0xd0, 0x30, 0x2e, 0xbd, - 0x3d, 0x4a, 0x71, 0x95, 0xf9, 0xb5, 0x73, 0x0b, 0x3d, 0x01, 0x28, 0x48, 0x27, 0x7a, 0xa7, 0xf4, - 0x33, 0x42, 0x85, 0xf5, 0x8e, 0xee, 0x5e, 0xa2, 0xcd, 0x9d, 0x7d, 0x05, 0xdd, 0x32, 0x35, 0x42, - 0xe3, 0xa5, 0xec, 0xc7, 0xe8, 0x0f, 0xa3, 0x7b, 0x57, 0x58, 0xe4, 0x8e, 0x7f, 0x05, 0xfd, 0x2a, - 0xe3, 0x41, 0xce, 0xd2, 0x89, 0x25, 0xf6, 0x34, 0x7a, 0xef, 0x4a, 0x1b, 0x13, 0x84, 0xa2, 0x45, - 0x95, 0x40, 0x58, 0xe8, 0x67, 0x25, 0x10, 0x16, 0xfb, 0x9a, 0x04, 0xa1, 0x5c, 0xd7, 0x25, 0x10, - 0x96, 0x76, 0xa1, 0x12, 0x08, 0xcb, 0x9b, 0x82, 0x73, 0x0b, 0x25, 0xb0, 0xb9, 0xbc, 0xda, 0x90, - 0xf9, 0x93, 0xca, 0x95, 0x25, 0x3b, 0xba, 0xff, 0x0d, 0x2c, 0xf5, 0x82, 0x93, 0xba, 0xf8, 0x13, - 0xe6, 0xa3, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0x2c, 0x29, 0xc6, 0x5d, 0x94, 0x19, 0x00, 0x00, + // 2083 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x59, 0x4b, 0x6f, 0x1c, 0xc7, + 0x11, 0xd6, 0x0c, 0x97, 0xcb, 0xdd, 0xda, 0x77, 0x93, 0xa2, 0x57, 0x6b, 0x4b, 0x5c, 0x8d, 0x03, + 0x98, 0x52, 0x1c, 0xc6, 0xa1, 0x0d, 0xc4, 0x48, 0x62, 0x18, 0x12, 0x45, 0x3b, 0x84, 0x44, 0x5a, + 0x9a, 0x55, 0x64, 0x20, 0x40, 0x30, 0xe9, 0x9d, 0x69, 0x92, 0x03, 0xce, 0x2b, 0xd3, 0xbd, 0x14, + 0xd7, 0xb9, 0x04, 0x48, 0x6e, 0x01, 0x72, 0xc9, 0x21, 0x7f, 0x21, 0xf7, 0xdc, 0x73, 0xc9, 0x8f, + 0xc8, 0x39, 0x7f, 0x21, 0x57, 0x23, 0x40, 0xd0, 0xaf, 0x79, 0xed, 0x92, 0x34, 0x0d, 0xe8, 0xa0, + 0xdb, 0x74, 0x55, 0x75, 0x75, 0xf5, 0x57, 0x5d, 0xd5, 0x5f, 0xef, 0x42, 0x3b, 0xc4, 0x94, 0x91, + 0x74, 0x27, 0x49, 0x63, 0x16, 0xa3, 0xa6, 0x1c, 0x39, 0xc9, 0xd4, 0xfa, 0x73, 0x1d, 0x9a, 0xbf, + 0x24, 0x38, 0x65, 0x53, 0x82, 0x19, 0xea, 0x82, 0xe9, 0x27, 0x43, 0x63, 0x6c, 0x6c, 0x37, 0x6d, + 0xd3, 0x4f, 0x10, 0x82, 0x5a, 0x12, 0xa7, 0x6c, 0x68, 0x8e, 0x8d, 0xed, 0x8e, 0x2d, 0xbe, 0xd1, + 0x5d, 0x80, 0x64, 0x36, 0x0d, 0x7c, 0xd7, 0x99, 0xa5, 0xc1, 0x70, 0x45, 0xd8, 0x36, 0xa5, 0xe4, + 0x57, 0x69, 0x80, 0xb6, 0xa1, 0x1f, 0xe2, 0x0b, 0xe7, 0x3c, 0x0e, 0x66, 0x21, 0x71, 0xdc, 0x78, + 0x16, 0xb1, 0x61, 0x4d, 0x4c, 0xef, 0x86, 0xf8, 0xe2, 0x95, 0x10, 0xef, 0x71, 0x29, 0x1a, 0xf3, + 0xa8, 0x2e, 0x9c, 0x63, 0x3f, 0x20, 0xce, 0x19, 0x99, 0x0f, 0x57, 0xc7, 0xc6, 0x76, 0xcd, 0x86, + 0x10, 0x5f, 0x7c, 0xe1, 0x07, 0xe4, 0x29, 0x99, 0xa3, 0x2d, 0x68, 0x79, 0x98, 0x61, 0xc7, 0x25, + 0x11, 0x23, 0xe9, 0xb0, 0x2e, 0xd6, 0x02, 0x2e, 0xda, 0x13, 0x12, 0x1e, 0x5f, 0x8a, 0xdd, 0xb3, + 0xe1, 0x9a, 0xd0, 0x88, 0x6f, 0x1e, 0x1f, 0xf6, 0x42, 0x3f, 0x72, 0x44, 0xe4, 0x0d, 0xb1, 0x74, + 0x53, 0x48, 0x9e, 0xf3, 0xf0, 0x3f, 0x83, 0x35, 0x19, 0x1b, 0x1d, 0x36, 0xc7, 0x2b, 0xdb, 0xad, + 0xdd, 0xf7, 0x77, 0x32, 0x34, 0x76, 0x64, 0x78, 0x07, 0xd1, 0x71, 0x9c, 0x86, 0x98, 0xf9, 0x71, + 0x74, 0x48, 0x28, 0xc5, 0x27, 0xc4, 0xd6, 0x73, 0xd0, 0x01, 0xb4, 0x22, 0xf2, 0xda, 0xd1, 0x2e, + 0x40, 0xb8, 0xd8, 0x5e, 0x70, 0x31, 0x39, 0x8d, 0x53, 0xb6, 0xc4, 0x0f, 0x44, 0xe4, 0xf5, 0x2b, + 0xe5, 0xea, 0x05, 0xf4, 0x3c, 0x12, 0x10, 0x46, 0xbc, 0xcc, 0x5d, 0xeb, 0x86, 0xee, 0xba, 0xca, + 0x81, 0x76, 0xf9, 0x03, 0xe8, 0x9e, 0x62, 0xea, 0x44, 0x71, 0xe6, 0xb1, 0x3d, 0x36, 0xb6, 0x1b, + 0x76, 0xfb, 0x14, 0xd3, 0xa3, 0x58, 0x5b, 0x7d, 0x09, 0x4d, 0xe2, 0x3a, 0xf4, 0x14, 0xa7, 0x1e, + 0x1d, 0xf6, 0xc5, 0x92, 0x0f, 0x17, 0x96, 0xdc, 0x77, 0x27, 0xdc, 0x60, 0xc9, 0xa2, 0x0d, 0x22, + 0x55, 0x14, 0x1d, 0x41, 0x87, 0x83, 0x91, 0x3b, 0x1b, 0xdc, 0xd8, 0x19, 0x47, 0x73, 0x5f, 0xfb, + 0x7b, 0x05, 0x03, 0x8d, 0x48, 0xee, 0x13, 0xdd, 0xd8, 0xa7, 0x86, 0x35, 0xf3, 0xfb, 0x01, 0xf4, + 0x15, 0x2c, 0xb9, 0xdb, 0x75, 0x01, 0x4c, 0x47, 0x00, 0xa3, 0x0d, 0xad, 0x3f, 0x98, 0x30, 0xc8, + 0xaa, 0xc1, 0x26, 0x34, 0x89, 0x23, 0x4a, 0xd0, 0x43, 0x18, 0xa8, 0xe3, 0x4c, 0xfd, 0x6f, 0x88, + 0x13, 0xf8, 0xa1, 0xcf, 0x44, 0x91, 0xd4, 0xec, 0x9e, 0x54, 0x4c, 0xfc, 0x6f, 0xc8, 0x33, 0x2e, + 0x46, 0x9b, 0x50, 0x0f, 0x08, 0xf6, 0x48, 0x2a, 0x6a, 0xa6, 0x69, 0xab, 0x11, 0xfa, 0x00, 0x7a, + 0x21, 0x61, 0xa9, 0xef, 0x52, 0x07, 0x7b, 0x5e, 0x4a, 0x28, 0x55, 0xa5, 0xd3, 0x55, 0xe2, 0x47, + 0x52, 0x8a, 0x3e, 0x85, 0xa1, 0x36, 0xf4, 0xf9, 0x19, 0x3f, 0xc7, 0x81, 0x43, 0x89, 0x1b, 0x47, + 0x1e, 0x55, 0x75, 0xb4, 0xa9, 0xf4, 0x07, 0x4a, 0x3d, 0x91, 0x5a, 0xf4, 0x04, 0xfa, 0x94, 0xc5, + 0x29, 0x3e, 0x21, 0xce, 0x14, 0xbb, 0x67, 0x84, 0xcf, 0x58, 0x15, 0xe0, 0xdd, 0x29, 0x80, 0x37, + 0x91, 0x26, 0x8f, 0xa5, 0x85, 0xdd, 0xa3, 0xa5, 0x31, 0xb5, 0xbe, 0x5d, 0x81, 0xe1, 0x65, 0x65, + 0x20, 0xfa, 0x83, 0x27, 0xb6, 0xde, 0xb1, 0x4d, 0xdf, 0xe3, 0xf5, 0xc7, 0x21, 0x11, 0x7b, 0xad, + 0xd9, 0xe2, 0x1b, 0xdd, 0x03, 0x70, 0xe3, 0x20, 0x20, 0x2e, 0x9f, 0xa8, 0x36, 0x59, 0x90, 0xf0, + 0xfa, 0x14, 0x25, 0x9f, 0xb7, 0x86, 0x9a, 0xdd, 0xe4, 0x12, 0xd9, 0x15, 0xee, 0x43, 0x5b, 0xa6, + 0x4f, 0x19, 0xc8, 0xae, 0xd0, 0x92, 0x32, 0x69, 0xf2, 0x21, 0x20, 0x7d, 0x4c, 0xa6, 0xf3, 0xcc, + 0xb0, 0x2e, 0x0c, 0xfb, 0x4a, 0xf3, 0x78, 0xae, 0xad, 0xdf, 0x85, 0x66, 0x4a, 0xb0, 0xe7, 0xc4, + 0x51, 0x30, 0x17, 0x8d, 0xa2, 0x61, 0x37, 0xb8, 0xe0, 0xab, 0x28, 0x98, 0xa3, 0x1f, 0xc2, 0x20, + 0x25, 0x49, 0xe0, 0xbb, 0xd8, 0x49, 0x02, 0xec, 0x92, 0x90, 0x44, 0xba, 0x67, 0xf4, 0x95, 0xe2, + 0xb9, 0x96, 0xa3, 0x21, 0xac, 0x9d, 0x93, 0x94, 0xf2, 0x6d, 0x35, 0x85, 0x89, 0x1e, 0xa2, 0x3e, + 0xac, 0x30, 0x16, 0x0c, 0x41, 0x48, 0xf9, 0x27, 0x7a, 0x00, 0x7d, 0x37, 0x0e, 0x13, 0xec, 0x32, + 0x27, 0x25, 0xe7, 0xbe, 0x98, 0xd4, 0x12, 0xea, 0x9e, 0x92, 0xdb, 0x4a, 0xcc, 0xb7, 0x13, 0xc6, + 0x9e, 0x7f, 0xec, 0x13, 0xcf, 0xc1, 0x4c, 0x25, 0x5b, 0x14, 0xee, 0x8a, 0xdd, 0xd7, 0x9a, 0x47, + 0x4c, 0xa6, 0x19, 0xed, 0xc0, 0x7a, 0x4a, 0xc2, 0x98, 0x11, 0x47, 0x27, 0x3b, 0xc2, 0x21, 0x19, + 0x76, 0x04, 0xce, 0x03, 0xa9, 0x52, 0x39, 0x3e, 0xc2, 0x21, 0xe1, 0xde, 0x2b, 0xf6, 0xbc, 0xd7, + 0x76, 0x85, 0x79, 0xbf, 0x64, 0xfe, 0x94, 0xcc, 0xad, 0xbf, 0x1b, 0x70, 0xf7, 0xca, 0x96, 0xb3, + 0x70, 0x04, 0xae, 0x4b, 0xf7, 0x9b, 0x42, 0xd8, 0x9a, 0xc1, 0xd6, 0x35, 0x8d, 0xe0, 0x9a, 0x58, + 0xcd, 0x85, 0x58, 0x2d, 0xe8, 0x10, 0xd7, 0xf1, 0x23, 0x8f, 0x5c, 0x38, 0x53, 0x9f, 0xc9, 0x12, + 0xed, 0xd8, 0x2d, 0xe2, 0x1e, 0x70, 0xd9, 0x63, 0x9f, 0x51, 0xeb, 0x9f, 0x06, 0x74, 0xcb, 0x35, + 0xc4, 0xab, 0x80, 0xcd, 0x13, 0xa2, 0xee, 0x4d, 0xf1, 0xad, 0x96, 0x36, 0xd5, 0x4d, 0xea, 0xa1, + 0x03, 0x80, 0x24, 0x8d, 0x13, 0x92, 0x32, 0x9f, 0x70, 0xbf, 0xbc, 0x2c, 0x1f, 0x5c, 0x5a, 0x96, + 0x3b, 0xcf, 0x33, 0xdb, 0xfd, 0x88, 0xa5, 0x73, 0xbb, 0x30, 0x79, 0xf4, 0x19, 0xf4, 0x2a, 0x6a, + 0x8e, 0x0e, 0xcf, 0xaa, 0x0c, 0x80, 0x7f, 0xa2, 0x0d, 0x58, 0x3d, 0xc7, 0xc1, 0x8c, 0xa8, 0x10, + 0xe4, 0xe0, 0x67, 0xe6, 0xa7, 0x86, 0xb5, 0x06, 0xab, 0xfb, 0x61, 0xc2, 0xe6, 0x7c, 0x27, 0xbd, + 0xc9, 0x2c, 0x21, 0xe9, 0xe3, 0x20, 0x76, 0xcf, 0xf6, 0x2f, 0x58, 0x8a, 0xd1, 0x57, 0xd0, 0x25, + 0x29, 0xa6, 0xb3, 0x94, 0x57, 0x95, 0xe7, 0x47, 0x27, 0xc2, 0x67, 0xf9, 0x4a, 0xaa, 0xcc, 0xd9, + 0xd9, 0x97, 0x13, 0xf6, 0x84, 0xbd, 0xdd, 0x21, 0xc5, 0xe1, 0xe8, 0xd7, 0xd0, 0x29, 0xe9, 0x39, + 0x58, 0xfc, 0x02, 0x57, 0x59, 0x11, 0xdf, 0xbc, 0x69, 0x26, 0x38, 0xf5, 0xd9, 0x5c, 0x11, 0x0d, + 0x35, 0xe2, 0xad, 0x42, 0x35, 0x5e, 0xdf, 0x93, 0xa0, 0x75, 0xec, 0xa6, 0x94, 0x1c, 0x78, 0xd4, + 0x7a, 0x08, 0x1b, 0x4f, 0x09, 0x49, 0xf6, 0xe2, 0x28, 0x22, 0x2e, 0x23, 0x9e, 0x4d, 0x7e, 0x37, + 0x23, 0x94, 0xf1, 0x25, 0x44, 0x4d, 0xa8, 0x7c, 0xf0, 0x6f, 0xeb, 0x6f, 0x06, 0x74, 0xe5, 0x71, + 0x79, 0x16, 0xbb, 0xe2, 0x90, 0x70, 0xd0, 0x38, 0x83, 0x51, 0xa0, 0xcd, 0xd2, 0xa0, 0x42, 0x6d, + 0xcc, 0x2a, 0xb5, 0xb9, 0x03, 0x0d, 0x71, 0xf7, 0xe7, 0xc1, 0xac, 0xf1, 0xeb, 0xdc, 0xf7, 0x68, + 0xde, 0xb5, 0x3c, 0xa9, 0xae, 0x09, 0x75, 0x4b, 0x5f, 0xcf, 0xdc, 0x24, 0xbf, 0x19, 0x56, 0x8b, + 0x37, 0x83, 0xf5, 0x12, 0xd6, 0x9f, 0xc5, 0xf1, 0xd9, 0x2c, 0x91, 0xe1, 0xe9, 0x4d, 0x94, 0xf7, + 0x6e, 0x8c, 0x57, 0x78, 0x2c, 0xd9, 0xde, 0xaf, 0x3b, 0xca, 0xd6, 0x7f, 0x0d, 0xd8, 0x28, 0xbb, + 0x55, 0x97, 0xd9, 0x6f, 0x61, 0x3d, 0xf3, 0xeb, 0x04, 0x0a, 0x0b, 0xb9, 0x40, 0x6b, 0xf7, 0xa3, + 0x42, 0x9a, 0x97, 0xcd, 0xd6, 0x04, 0xc9, 0xd3, 0x20, 0xda, 0x83, 0xf3, 0x8a, 0x84, 0x8e, 0x2e, + 0xa0, 0x5f, 0x35, 0xe3, 0x4d, 0x38, 0x5b, 0x55, 0x21, 0xde, 0xd0, 0x33, 0xd1, 0x4f, 0xa0, 0x99, + 0x07, 0x62, 0x8a, 0x40, 0xd6, 0x4b, 0x81, 0xa8, 0xb5, 0x72, 0x2b, 0x7e, 0xbc, 0x49, 0x9a, 0xc6, + 0xa9, 0x6a, 0x38, 0x72, 0x60, 0xfd, 0x1c, 0x1a, 0xdf, 0x3b, 0xbb, 0xd6, 0x3f, 0x4c, 0xe8, 0x3c, + 0xa2, 0xd4, 0x3f, 0x89, 0x74, 0x0a, 0x36, 0x60, 0x55, 0x5e, 0x2d, 0xf2, 0xae, 0x97, 0x03, 0x34, + 0x86, 0x96, 0xea, 0x5b, 0x05, 0xe8, 0x8b, 0xa2, 0x6b, 0x5b, 0xa2, 0xea, 0x65, 0x35, 0x19, 0x1a, + 0xbf, 0x2d, 0x2a, 0x44, 0x77, 0xf5, 0x52, 0xa2, 0x5b, 0x2f, 0x10, 0xdd, 0x77, 0xa1, 0x29, 0x26, + 0x45, 0xb1, 0x47, 0x14, 0x03, 0x6e, 0x70, 0xc1, 0x51, 0xec, 0x11, 0xb4, 0x0b, 0x9b, 0x21, 0x09, + 0xe3, 0x74, 0xee, 0x84, 0x38, 0x71, 0x38, 0xcf, 0x16, 0xdc, 0x25, 0x9c, 0xaa, 0xde, 0x8b, 0xa4, + 0xf6, 0x10, 0x27, 0x87, 0xf8, 0x82, 0xd3, 0x97, 0xc3, 0x29, 0xda, 0x85, 0xdb, 0x5f, 0xa7, 0x3e, + 0xc3, 0xd3, 0x80, 0x94, 0xf9, 0xbb, 0xec, 0xc5, 0xeb, 0x5a, 0x59, 0x20, 0xf1, 0xd6, 0x5f, 0x0d, + 0xe8, 0x6a, 0xd4, 0xd4, 0x09, 0xeb, 0xc3, 0xca, 0x71, 0x96, 0x65, 0xfe, 0xa9, 0x73, 0x61, 0x5e, + 0x96, 0x8b, 0x85, 0x47, 0x44, 0x86, 0x7c, 0xad, 0x88, 0x7c, 0x96, 0xf4, 0xd5, 0x42, 0xd2, 0x39, + 0x34, 0x78, 0xc6, 0x4e, 0x35, 0x34, 0xfc, 0xdb, 0x3a, 0x81, 0xc1, 0x84, 0x61, 0xe6, 0x53, 0xe6, + 0xbb, 0x54, 0xa7, 0xb3, 0x92, 0x38, 0xe3, 0xba, 0xc4, 0x99, 0x97, 0x25, 0x6e, 0x25, 0x4b, 0x9c, + 0xf5, 0x2f, 0x03, 0x50, 0x71, 0x25, 0x05, 0xc1, 0x1b, 0x58, 0x8a, 0x43, 0xc6, 0x62, 0xc6, 0xd9, + 0x20, 0x67, 0x5c, 0x8a, 0x37, 0x09, 0x09, 0x4f, 0x1f, 0x3f, 0x0d, 0x33, 0x4a, 0x3c, 0xa9, 0x95, + 0xa4, 0xa9, 0xc1, 0x05, 0x42, 0x59, 0xe6, 0x5c, 0xf5, 0x0a, 0xe7, 0xb2, 0x1e, 0x41, 0x4b, 0xdd, + 0x3f, 0x2f, 0xf9, 0xdd, 0x75, 0x7d, 0xf4, 0x2a, 0x3a, 0x33, 0x07, 0x62, 0x0c, 0xb0, 0x97, 0x47, + 0xbf, 0xac, 0x03, 0xff, 0x1e, 0x6e, 0xe7, 0x16, 0xcf, 0x7c, 0xca, 0x74, 0x5e, 0x3e, 0x81, 0x4d, + 0x3f, 0x72, 0x83, 0x99, 0x47, 0x9c, 0x88, 0xdf, 0xe0, 0x41, 0xf6, 0x78, 0x31, 0x04, 0x5b, 0xdb, + 0x50, 0xda, 0x23, 0xa1, 0xd4, 0x8f, 0x98, 0x0f, 0x01, 0xe9, 0x59, 0xc4, 0xcd, 0x66, 0x98, 0x62, + 0x46, 0x5f, 0x69, 0xf6, 0x5d, 0x65, 0x6d, 0xbd, 0x80, 0xcd, 0xea, 0xe2, 0x2a, 0x55, 0x3f, 0x85, + 0x56, 0x0e, 0xbb, 0xee, 0x83, 0xb7, 0x0b, 0xed, 0x27, 0x9f, 0x67, 0x17, 0x2d, 0xad, 0x1f, 0xc1, + 0x3b, 0xb9, 0xea, 0x89, 0x68, 0xf4, 0x57, 0x5d, 0x40, 0x23, 0x18, 0x2e, 0x9a, 0xcb, 0x18, 0xac, + 0xff, 0x98, 0xd0, 0x7e, 0xa2, 0x2a, 0x97, 0xd3, 0x98, 0x02, 0x71, 0x91, 0xec, 0xe1, 0x3e, 0xb4, + 0x4b, 0x05, 0x29, 0xf9, 0x76, 0xeb, 0xbc, 0xf0, 0x9a, 0x5e, 0xf6, 0xee, 0x5e, 0x11, 0x66, 0xd5, + 0x77, 0xf7, 0x43, 0x18, 0x1c, 0xa7, 0x84, 0x2c, 0x3e, 0xd1, 0x6b, 0x76, 0x8f, 0x2b, 0x8a, 0xb6, + 0x3b, 0xb0, 0x8e, 0x5d, 0xe6, 0x9f, 0x57, 0xac, 0xe5, 0xf9, 0x1a, 0x48, 0x55, 0xd1, 0xfe, 0x8b, + 0x2c, 0x50, 0x3f, 0x3a, 0x8e, 0xe9, 0xb0, 0xfe, 0xdd, 0x9f, 0xd8, 0x6a, 0x37, 0x5c, 0x43, 0xd1, + 0x73, 0xe8, 0xea, 0xa7, 0x9a, 0xf2, 0xb4, 0x76, 0xe3, 0x67, 0x60, 0x9b, 0xe4, 0x2a, 0x6a, 0xfd, + 0xc9, 0x84, 0x86, 0x8d, 0xdd, 0xb3, 0xb7, 0x1b, 0xdf, 0xcf, 0xa1, 0x97, 0xf5, 0xfc, 0x12, 0xc4, + 0xef, 0x14, 0x80, 0x29, 0x1e, 0x25, 0xbb, 0xe3, 0x15, 0x46, 0xd4, 0xfa, 0x9f, 0x01, 0xdd, 0x27, + 0xd9, 0xbd, 0xf2, 0x76, 0x83, 0xb1, 0x0b, 0xc0, 0x2f, 0xc2, 0x12, 0x0e, 0x45, 0xe2, 0xa0, 0xd3, + 0x6d, 0x37, 0x53, 0xf5, 0x45, 0xad, 0xbf, 0x98, 0xd0, 0x7e, 0x19, 0x27, 0x71, 0x10, 0x9f, 0xcc, + 0xdf, 0xee, 0xdd, 0xef, 0xc3, 0xa0, 0xc0, 0x19, 0x4a, 0x20, 0xdc, 0xa9, 0x1c, 0x86, 0x3c, 0xd9, + 0x76, 0xcf, 0x2b, 0x8d, 0xa9, 0xb5, 0x0e, 0x03, 0xc5, 0x8b, 0xf3, 0x96, 0x6c, 0xfd, 0xd1, 0x00, + 0x54, 0x94, 0xaa, 0x5e, 0xf9, 0x0b, 0xe8, 0x30, 0x85, 0x9d, 0x58, 0x4f, 0x3d, 0x0e, 0x8a, 0x67, + 0xaf, 0x88, 0xad, 0xdd, 0x66, 0x45, 0xa4, 0x7f, 0x0c, 0x1b, 0x0b, 0x3f, 0xa3, 0x70, 0x42, 0x22, + 0x11, 0x1e, 0x54, 0x7e, 0x49, 0x39, 0x9c, 0x5a, 0x9f, 0xc0, 0x6d, 0x49, 0x42, 0x75, 0x1f, 0xd7, + 0xfd, 0x75, 0x81, 0x4d, 0x76, 0x72, 0x36, 0x69, 0x7d, 0x6b, 0xc0, 0x66, 0x75, 0x9a, 0x8a, 0xff, + 0xaa, 0x79, 0x08, 0x03, 0x52, 0xfd, 0xa6, 0xc8, 0x8b, 0x25, 0x1d, 0xfd, 0x78, 0x81, 0x17, 0x57, + 0x7d, 0xef, 0xe8, 0x3e, 0x94, 0x53, 0xe3, 0x3e, 0x2d, 0x0b, 0xe8, 0x08, 0xc3, 0x60, 0xc1, 0x8c, + 0xbf, 0x2a, 0xf4, 0xba, 0x2a, 0xa6, 0x35, 0x35, 0xf1, 0x7b, 0x10, 0x63, 0x6b, 0x0b, 0xee, 0x7e, + 0x49, 0xd8, 0xa1, 0xb0, 0xd9, 0x8b, 0xa3, 0x63, 0xff, 0x64, 0x96, 0x4a, 0xa3, 0x3c, 0xb5, 0xf7, + 0x2e, 0xb3, 0x50, 0x30, 0x2d, 0xf9, 0xad, 0xca, 0xb8, 0xf1, 0x6f, 0x55, 0xe6, 0x55, 0xbf, 0x55, + 0xed, 0xfe, 0xbb, 0x0e, 0x6b, 0x13, 0x82, 0x5f, 0x13, 0xc2, 0x9f, 0xc6, 0x9d, 0x09, 0x89, 0xbc, + 0xfc, 0x57, 0xe8, 0x8d, 0xc2, 0x1e, 0x33, 0xe9, 0xe8, 0xbd, 0x65, 0xd2, 0xec, 0x0a, 0xbd, 0xb5, + 0x6d, 0x7c, 0x64, 0xa0, 0x17, 0xd0, 0x29, 0xbd, 0x08, 0xd1, 0x56, 0x61, 0xd2, 0xb2, 0xb7, 0xe2, + 0xe8, 0xce, 0xc2, 0x85, 0xa2, 0x51, 0xcd, 0x5c, 0xb6, 0x8b, 0x2f, 0x21, 0x74, 0xef, 0xd2, 0x27, + 0x92, 0x74, 0xb8, 0x75, 0xcd, 0x13, 0xca, 0xba, 0x85, 0x3e, 0x87, 0xba, 0xa4, 0xcc, 0x68, 0x58, + 0x30, 0x2e, 0xbd, 0x3d, 0x4a, 0x71, 0x95, 0xf9, 0xb5, 0x75, 0x0b, 0x3d, 0x05, 0xc8, 0x49, 0x27, + 0x7a, 0xaf, 0xf4, 0x33, 0x42, 0x85, 0xf5, 0x8e, 0xee, 0x5e, 0xa2, 0xcd, 0x9c, 0x7d, 0x0d, 0xdd, + 0x32, 0x35, 0x42, 0xe3, 0xa5, 0xec, 0xa7, 0xd0, 0x1f, 0x46, 0xf7, 0xaf, 0xb0, 0xc8, 0x1c, 0xff, + 0x06, 0xfa, 0x55, 0xc6, 0x83, 0xac, 0xa5, 0x13, 0x4b, 0xec, 0x69, 0xf4, 0xfe, 0x95, 0x36, 0x45, + 0x10, 0xf2, 0x16, 0x55, 0x02, 0x61, 0xa1, 0x9f, 0x95, 0x40, 0x58, 0xec, 0x6b, 0x12, 0x84, 0x72, + 0x5d, 0x97, 0x40, 0x58, 0xda, 0x85, 0x4a, 0x20, 0x2c, 0x6f, 0x0a, 0xd6, 0x2d, 0x14, 0xc3, 0xe6, + 0xf2, 0x6a, 0x43, 0xc5, 0x9f, 0x54, 0xae, 0x2c, 0xd9, 0xd1, 0x83, 0xef, 0x60, 0xa9, 0x17, 0x9c, + 0xd6, 0xc5, 0x5f, 0x3c, 0x1f, 0xff, 0x3f, 0x00, 0x00, 0xff, 0xff, 0x82, 0x5b, 0x59, 0x60, 0xf2, + 0x19, 0x00, 0x00, } diff --git a/weed/server/volume_server_handlers_ui.go b/weed/server/volume_server_handlers_ui.go index 914b654ff..63a9fe230 100644 --- a/weed/server/volume_server_handlers_ui.go +++ b/weed/server/volume_server_handlers_ui.go @@ -8,6 +8,7 @@ import ( "github.com/chrislusf/seaweedfs/weed/pb/volume_server_pb" ui "github.com/chrislusf/seaweedfs/weed/server/volume_server_ui" "github.com/chrislusf/seaweedfs/weed/stats" + "github.com/chrislusf/seaweedfs/weed/storage" "github.com/chrislusf/seaweedfs/weed/util" ) @@ -20,19 +21,30 @@ func (vs *VolumeServer) uiStatusHandler(w http.ResponseWriter, r *http.Request) ds = append(ds, stats.NewDiskStatus(dir)) } } + volumeInfos := vs.store.VolumeInfos() + var normalVolumeInfos, remoteVolumeInfos []*storage.VolumeInfo + for _, vinfo := range volumeInfos { + if vinfo.RemoteStorageName == "" { + normalVolumeInfos = append(normalVolumeInfos, vinfo) + } else { + remoteVolumeInfos = append(remoteVolumeInfos, vinfo) + } + } args := struct { - Version string - Masters []string - Volumes interface{} - EcVolumes interface{} - DiskStatuses interface{} - Stats interface{} - Counters *stats.ServerStats + Version string + Masters []string + Volumes interface{} + EcVolumes interface{} + RemoteVolumes interface{} + DiskStatuses interface{} + Stats interface{} + Counters *stats.ServerStats }{ util.VERSION, vs.SeedMasterNodes, - vs.store.VolumeInfos(), + normalVolumeInfos, vs.store.EcVolumes(), + remoteVolumeInfos, ds, infos, serverStats, diff --git a/weed/server/volume_server_ui/templates.go b/weed/server/volume_server_ui/templates.go index eafc0aaeb..1294604cd 100644 --- a/weed/server/volume_server_ui/templates.go +++ b/weed/server/volume_server_ui/templates.go @@ -128,6 +128,36 @@ var StatusTpl = template.Must(template.New("status").Funcs(funcMap).Parse(` +
+

Remote Volumes

+ + + + + + + + + + + + + + {{ range .RemoteVolumes }} + + + + + + + + + + {{ end }} + +
IdCollectionSizeFilesTrashRemoteKey
{{ .Id }}{{ .Collection }}{{ .Size }} Bytes{{ .FileCount }}{{ .DeleteCount }} / {{.DeletedByteCount}} Bytes{{ .RemoteStorageName }}{{ .RemoteStorageKey }}
+
+

Erasure Coding Shards

diff --git a/weed/storage/store.go b/weed/storage/store.go index c2ea5a4f0..835d363df 100644 --- a/weed/storage/store.go +++ b/weed/storage/store.go @@ -144,6 +144,7 @@ func (s *Store) VolumeInfos() []*VolumeInfo { Ttl: v.Ttl, CompactRevision: uint32(v.CompactionRevision), } + s.RemoteStorageName, s.RemoteStorageKey = v.RemoteStorageNameKey() stats = append(stats, s) } location.volumesLock.RUnlock() diff --git a/weed/storage/volume.go b/weed/storage/volume.go index ee05126e1..f93651982 100644 --- a/weed/storage/volume.go +++ b/weed/storage/volume.go @@ -203,7 +203,7 @@ func (v *Volume) expiredLongEnough(maxDelayMinutes uint32) bool { func (v *Volume) ToVolumeInformationMessage() *master_pb.VolumeInformationMessage { size, _, modTime := v.FileStat() - return &master_pb.VolumeInformationMessage{ + volumInfo := &master_pb.VolumeInformationMessage{ Id: uint32(v.Id), Size: size, Collection: v.Collection, @@ -217,4 +217,15 @@ func (v *Volume) ToVolumeInformationMessage() *master_pb.VolumeInformationMessag CompactRevision: uint32(v.SuperBlock.CompactionRevision), ModifiedAtSecond: modTime.Unix(), } + + volumInfo.RemoteStorageName, volumInfo.RemoteStorageKey = v.RemoteStorageNameKey() + + return volumInfo +} + +func (v *Volume) RemoteStorageNameKey() (storageName, storageKey string) { + if len(v.volumeTierInfo.GetFiles()) == 0 { + return + } + return v.volumeTierInfo.GetFiles()[0].BackendName(), v.volumeTierInfo.GetFiles()[0].GetKey() } diff --git a/weed/storage/volume_info.go b/weed/storage/volume_info.go index 111058b6e..9bafa0877 100644 --- a/weed/storage/volume_info.go +++ b/weed/storage/volume_info.go @@ -9,18 +9,20 @@ import ( ) type VolumeInfo struct { - Id needle.VolumeId - Size uint64 - ReplicaPlacement *ReplicaPlacement - Ttl *needle.TTL - Collection string - Version needle.Version - FileCount int - DeleteCount int - DeletedByteCount uint64 - ReadOnly bool - CompactRevision uint32 - ModifiedAtSecond int64 + Id needle.VolumeId + Size uint64 + ReplicaPlacement *ReplicaPlacement + Ttl *needle.TTL + Collection string + Version needle.Version + FileCount int + DeleteCount int + DeletedByteCount uint64 + ReadOnly bool + CompactRevision uint32 + ModifiedAtSecond int64 + RemoteStorageName string + RemoteStorageKey string } func NewVolumeInfo(m *master_pb.VolumeInformationMessage) (vi VolumeInfo, err error) {