milvus-io
/
milvus
mirror of https://github.com/milvus-io/milvus.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Disable register link logic, use proxy node directly 

Signed-off-by: dragondriver <jiquan.long@zilliz.com>
pull/4973/head^2
dragondriver 2021-03-04 22:27:12 +08:00 committed by yefu.chen
parent c1d43134de
commit 801396e3ef
14 changed files with 227 additions and 154 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
build/docker/deploy/.env
View File

@ -11,7 +11,7 @@ INDEX_NODE_HOST=indexnode
QUERY_NODE_HOST1=querynode1
QUERY_NODE_HOST2=querynode2
DATA_NODE_HOST=datanode
PROXY_SERVICE_ADDRESS=proxyservice:19530
PROXY_SERVICE_ADDRESS=proxyservice:21122
INDEX_SERVICE_ADDRESS=indexservice:31000
DATA_SERVICE_ADDRESS=dataservice:13333
QUERY_SERVICE_ADDRESS=queryservice:19531

4
build/docker/test/docker-compose.yml
View File

@ -12,7 +12,7 @@ services:
- ../../..:/milvus-distributed:delegated
working_dir: "/milvus-distributed/tests/python"
command: >
/bin/bash -c "pytest --ip proxyservice -n 4"
/bin/bash -c "pytest --ip proxynode -n 4"
networks:
- milvus
@ -27,7 +27,7 @@ services:
- ../../..:/milvus-distributed:delegated
working_dir: "/milvus-distributed/tests/python_test"
command: >
/bin/bash -c "pytest --tags=0331 --ip proxyservice -n 4"
/bin/bash -c "sleep 10s && pytest -s --tags=0331 --ip proxynode -n 4"
networks:
- milvus

4
configs/milvus.yaml
View File

@ -47,7 +47,7 @@ master:
port: 53100
proxyNode:
port: 21122
port: 19530
queryService:
address: localhost
@ -55,7 +55,7 @@ queryService:
proxyService:
address: localhost
port: 19530
port: 21122
queryNode:
gracefulTime: 5000 #ms

17
internal/core/src/pb/milvus.pb.cc
View File

@ -1610,7 +1610,7 @@ const char descriptor_table_protodef_milvus_2eproto[] PROTOBUF_SECTION_VARIABLE(
"n.Address\022+\n\006status\030\002 \001(\0132\033.milvus.proto"
".common.Status*@\n\017PlaceholderType\022\010\n\004NON"
"E\020\000\022\021\n\rVECTOR_BINARY\020d\022\020\n\014VECTOR_FLOAT\020e"
"2\276\023\n\rMilvusService\022_\n\020CreateCollection\022,"
"2\227\024\n\rMilvusService\022_\n\020CreateCollection\022,"
".milvus.proto.milvus.CreateCollectionReq"
"uest\032\033.milvus.proto.common.Status\"\000\022[\n\016D"
"ropCollection\022*.milvus.proto.milvus.Drop"
@ -1672,11 +1672,14 @@ const char descriptor_table_protodef_milvus_2eproto[] PROTOBUF_SECTION_VARIABLE(
"gmentInfoResponse\"\000\022t\n\023GetQuerySegmentIn"
"fo\022,.milvus.proto.milvus.QuerySegmentInf"
"oRequest\032-.milvus.proto.milvus.QuerySegm"
"entInfoResponse\"\0002g\n\014ProxyService\022W\n\014Reg"
"isterLink\022\032.milvus.proto.common.Empty\032)."
"milvus.proto.milvus.RegisterLinkResponse"
"\"\000BBZ@github.com/zilliztech/milvus-distr"
"ibuted/internal/proto/milvuspbb\006proto3"
"entInfoResponse\"\000\022W\n\014RegisterLink\022\032.milv"
"us.proto.common.Empty\032).milvus.proto.mil"
"vus.RegisterLinkResponse\"\0002g\n\014ProxyServi"
"ce\022W\n\014RegisterLink\022\032.milvus.proto.common"
".Empty\032).milvus.proto.milvus.RegisterLin"
"kResponse\"\000BBZ@github.com/zilliztech/mil"
"vus-distributed/internal/proto/milvuspbb"
"\006proto3"
;
static const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable*const descriptor_table_milvus_2eproto_deps[2] = {
&::descriptor_table_common_2eproto,
@ -1735,7 +1738,7 @@ static ::PROTOBUF_NAMESPACE_ID::internal::SCCInfoBase*const descriptor_table_mil
static ::PROTOBUF_NAMESPACE_ID::internal::once_flag descriptor_table_milvus_2eproto_once;
static bool descriptor_table_milvus_2eproto_initialized = false;
const ::PROTOBUF_NAMESPACE_ID::internal::DescriptorTable descriptor_table_milvus_2eproto = {
&descriptor_table_milvus_2eproto_initialized, descriptor_table_protodef_milvus_2eproto, "milvus.proto", 8718,
&descriptor_table_milvus_2eproto_initialized, descriptor_table_protodef_milvus_2eproto, "milvus.proto", 8807,
&descriptor_table_milvus_2eproto_once, descriptor_table_milvus_2eproto_sccs, descriptor_table_milvus_2eproto_deps, 48, 2,
schemas, file_default_instances, TableStruct_milvus_2eproto::offsets,
file_level_metadata_milvus_2eproto, 48, file_level_enum_descriptors_milvus_2eproto, file_level_service_descriptors_milvus_2eproto,

14
internal/core/src/segcore/segment_c.cpp
View File

@ -150,14 +150,14 @@ Insert(CSegmentInterface c_segment,
void* raw_data,
int sizeof_per_row,
int64_t count) {
auto segment = (milvus::segcore::SegmentGrowing*)c_segment;
milvus::segcore::RowBasedRawData dataChunk{};
dataChunk.raw_data = raw_data;
dataChunk.sizeof_per_row = sizeof_per_row;
dataChunk.count = count;
try {
auto segment = (milvus::segcore::SegmentGrowing*)c_segment;
milvus::segcore::RowBasedRawData dataChunk{};
dataChunk.raw_data = raw_data;
dataChunk.sizeof_per_row = sizeof_per_row;
dataChunk.count = count;
auto res = segment->Insert(reserved_offset, size, row_ids, timestamps, dataChunk);
auto status = CStatus();

10
internal/distributed/proxynode/service.go
View File

@ -108,6 +108,7 @@ func (s *Server) Run() error {
}
func (s *Server) init() error {
ctx := context.Background()
var err error
Params.Init()
if !funcutil.CheckPortAvailable(Params.Port) {
@ -174,6 +175,11 @@ func (s *Server) init() error {
if err != nil {
return err
}
err = funcutil.WaitForComponentHealthy(ctx, s.masterServiceClient, "MasterService", 100, time.Millisecond*200)
if err != nil {
panic(err)
}
s.impl.SetMasterClient(s.masterServiceClient)
log.Println("set master client ...")
@ -354,3 +360,7 @@ func (s *Server) GetQuerySegmentInfo(ctx context.Context, request *milvuspb.Quer
return s.impl.GetQuerySegmentInfo(ctx, request)
}
func (s *Server) RegisterLink(ctx context.Context, empty *commonpb.Empty) (*milvuspb.RegisterLinkResponse, error) {
return s.impl.RegisterLink(empty)
}

1
internal/proto/milvus.proto
View File

@ -353,6 +353,7 @@ service MilvusService {
rpc GetPersistentSegmentInfo(PersistentSegmentInfoRequest) returns (PersistentSegmentInfoResponse) {}
rpc GetQuerySegmentInfo(QuerySegmentInfoRequest) returns (QuerySegmentInfoResponse) {}
rpc RegisterLink(common.Empty) returns (RegisterLinkResponse) {}
}
message RegisterLinkResponse {

288
internal/proto/milvuspb/milvus.pb.go
View File

@ -2896,132 +2896,132 @@ func init() {
func init() { proto.RegisterFile("milvus.proto", fileDescriptor_02345ba45cc0e303) }
var fileDescriptor_02345ba45cc0e303 = []byte{
// 1991 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0xdd, 0x6f, 0x1b, 0x4b,
0x15, 0xcf, 0xd8, 0x8e, 0x93, 0x9c, 0xac, 0x13, 0x67, 0xf2, 0xe5, 0xfa, 0xb6, 0xdc, 0x74, 0xa1,
0xb7, 0xe9, 0x67, 0x20, 0x97, 0x4f, 0x21, 0xa4, 0x36, 0x4d, 0x6f, 0x6a, 0xb5, 0xb7, 0x4d, 0xd7,
0xe1, 0x42, 0xb9, 0xaa, 0xcc, 0xda, 0x3b, 0xb5, 0x97, 0xbb, 0xde, 0x35, 0x3b, 0xe3, 0xa4, 0xe9,
0x13, 0xa2, 0x08, 0x24, 0xee, 0x15, 0xe2, 0x09, 0x89, 0x57, 0x24, 0x5e, 0x11, 0x5c, 0x10, 0x8f,
0x3c, 0x81, 0x84, 0xc4, 0xdf, 0xc1, 0x13, 0xe2, 0x4f, 0x40, 0x42, 0x33, 0xb3, 0xde, 0xec, 0xae,
0x67, 0x6d, 0xb7, 0xbe, 0xb7, 0x71, 0xde, 0x3c, 0x67, 0xcf, 0xcc, 0xfc, 0xce, 0x99, 0x73, 0xce,
0x9c, 0x39, 0xc7, 0xa0, 0xb5, 0x6d, 0xe7, 0xb0, 0x4b, 0x6f, 0x76, 0x7c, 0x8f, 0x79, 0x78, 0x39,
0x3a, 0xba, 0x29, 0x07, 0x65, 0xad, 0xe1, 0xb5, 0xdb, 0x9e, 0x2b, 0x89, 0x65, 0x8d, 0x36, 0x5a,
0xa4, 0x6d, 0xca, 0x91, 0xfe, 0x7b, 0x04, 0xeb, 0x77, 0x7c, 0x62, 0x32, 0x72, 0xc7, 0x73, 0x1c,
0xd2, 0x60, 0xb6, 0xe7, 0x1a, 0xe4, 0xc7, 0x5d, 0x42, 0x19, 0xfe, 0x32, 0xe4, 0xea, 0x26, 0x25,
0x25, 0xb4, 0x81, 0x36, 0xe7, 0xb7, 0xcf, 0xdf, 0x8c, 0xad, 0x1d, 0xac, 0xf9, 0x3e, 0x6d, 0xee,
0x98, 0x94, 0x18, 0x82, 0x13, 0xaf, 0xc3, 0x8c, 0x55, 0xaf, 0xb9, 0x66, 0x9b, 0x94, 0x32, 0x1b,
0x68, 0x73, 0xce, 0xc8, 0x5b, 0xf5, 0x87, 0x66, 0x9b, 0xe0, 0xcb, 0xb0, 0xd8, 0x08, 0xd7, 0x97,
0x0c, 0x59, 0xc1, 0xb0, 0x70, 0x42, 0x16, 0x8c, 0x6b, 0x90, 0x97, 0xf8, 0x4a, 0xb9, 0x0d, 0xb4,
0xa9, 0x19, 0xc1, 0x48, 0xff, 0x18, 0xc1, 0xea, 0xae, 0xef, 0x75, 0x26, 0x02, 0xa5, 0xfe, 0x4b,
0x04, 0x2b, 0xf7, 0x4c, 0x3a, 0x19, 0x60, 0x9e, 0x80, 0xb6, 0xe3, 0x79, 0x8e, 0x41, 0x68, 0xc7,
0x73, 0x29, 0xc1, 0xef, 0x42, 0x9e, 0x32, 0x93, 0x75, 0x69, 0x80, 0xe2, 0x2d, 0x25, 0x8a, 0xaa,
0x60, 0x31, 0x02, 0x56, 0xbc, 0x02, 0xd3, 0x87, 0xa6, 0xd3, 0x95, 0x20, 0x66, 0x0d, 0x39, 0xd0,
0x3f, 0x84, 0x85, 0x2a, 0xf3, 0x6d, 0xb7, 0xf9, 0x19, 0x2e, 0x3e, 0xd7, 0x5b, 0xfc, 0xcf, 0x08,
0xce, 0xed, 0x12, 0xda, 0xf0, 0xed, 0xfa, 0x84, 0x18, 0x9f, 0x0e, 0xda, 0x09, 0xa5, 0xb2, 0x2b,
0x4c, 0x30, 0x6b, 0xc4, 0x68, 0xfa, 0x5f, 0x10, 0x94, 0x55, 0xa8, 0xc7, 0xd1, 0xcf, 0x77, 0x42,
0xa3, 0xcf, 0x88, 0x49, 0x97, 0xe2, 0x93, 0x02, 0x87, 0x3d, 0xd9, 0xad, 0x2a, 0x08, 0x3d, 0xdf,
0xe8, 0x83, 0x9d, 0x55, 0xc0, 0xe6, 0xfe, 0xf3, 0xc0, 0x33, 0xad, 0xc9, 0x30, 0xd9, 0x5f, 0x21,
0x28, 0x19, 0xc4, 0x21, 0x26, 0x9d, 0x8c, 0x93, 0xd7, 0x3f, 0x41, 0xb0, 0x16, 0xd1, 0x2f, 0x33,
0x19, 0x3d, 0x4d, 0x38, 0xbf, 0xe0, 0x51, 0x39, 0x09, 0x67, 0x1c, 0x0b, 0xfb, 0x06, 0x4c, 0xf3,
0x5f, 0xb4, 0x94, 0xd9, 0xc8, 0x6e, 0xce, 0x6f, 0x5f, 0x54, 0xce, 0xb9, 0x4f, 0x8e, 0x3f, 0xe0,
0x9e, 0xb9, 0x6f, 0xda, 0xbe, 0x21, 0xf9, 0xf5, 0x3a, 0xac, 0x56, 0x5b, 0xde, 0xd1, 0xe7, 0x79,
0x4a, 0xfa, 0x73, 0x58, 0x4b, 0xee, 0x31, 0x8e, 0xac, 0x57, 0xa0, 0x98, 0xd0, 0xb2, 0x14, 0x7b,
0xce, 0x58, 0x8c, 0xab, 0x99, 0xf2, 0x10, 0xb4, 0x26, 0x6f, 0xbf, 0x7d, 0xd3, 0x67, 0xf6, 0x69,
0xc7, 0x9f, 0x4b, 0xb0, 0xd0, 0xe9, 0xe1, 0x90, 0x7c, 0x39, 0xc1, 0x57, 0x08, 0xa9, 0x42, 0x5f,
0x7f, 0x42, 0xb0, 0xc2, 0xef, 0xc2, 0xb3, 0x84, 0xf9, 0x8f, 0x08, 0x96, 0xef, 0x99, 0xf4, 0x2c,
0x41, 0xfe, 0x14, 0xc1, 0x32, 0x0f, 0x99, 0x12, 0xf3, 0xe9, 0x42, 0xbe, 0x0c, 0x8b, 0x71, 0xc8,
0xb4, 0x94, 0x13, 0x26, 0xbd, 0x10, 0xc3, 0x4c, 0xf5, 0xbf, 0x22, 0x58, 0x0f, 0x22, 0xeb, 0x44,
0xe8, 0x7a, 0x64, 0xe0, 0x9f, 0x22, 0x58, 0x0d, 0x11, 0x9f, 0x76, 0x00, 0x1e, 0xd5, 0x44, 0x7e,
0x8e, 0x60, 0x2d, 0x09, 0xfa, 0x54, 0xc2, 0xf4, 0x1f, 0x10, 0xac, 0xf0, 0x18, 0x3a, 0x11, 0x67,
0x3e, 0x4a, 0x1a, 0xf5, 0x5b, 0x24, 0x2f, 0x96, 0x08, 0xe0, 0x71, 0x14, 0xa7, 0x30, 0xb3, 0x8c,
0xca, 0xcc, 0x38, 0xb6, 0x90, 0x52, 0xd9, 0xa5, 0xa5, 0xec, 0x46, 0x96, 0x63, 0x8b, 0xd2, 0x44,
0x32, 0xd0, 0x4b, 0xf1, 0xaa, 0xa4, 0xd9, 0x26, 0x2e, 0x7b, 0x7d, 0x75, 0x26, 0x95, 0x91, 0xe9,
0x57, 0x06, 0x3e, 0x0f, 0x73, 0x54, 0xee, 0x13, 0x66, 0x6f, 0x27, 0x04, 0xfd, 0xa7, 0x08, 0xd6,
0xfb, 0xe0, 0x8c, 0xa3, 0xac, 0x12, 0xcc, 0xd8, 0xae, 0x45, 0x9e, 0x87, 0x68, 0x7a, 0x43, 0xfe,
0xa5, 0xde, 0xb5, 0x1d, 0x2b, 0x84, 0xd1, 0x1b, 0x72, 0x9d, 0x60, 0x7e, 0x5e, 0x6f, 0x44, 0x1f,
0x1b, 0x30, 0x1f, 0x39, 0x90, 0x00, 0x4a, 0x94, 0xa4, 0xff, 0x08, 0x96, 0x63, 0x68, 0xc6, 0x51,
0xc7, 0x17, 0x00, 0x42, 0x65, 0x4b, 0xb3, 0xc9, 0x1a, 0x11, 0x8a, 0xfe, 0x5f, 0x04, 0x58, 0x26,
0x09, 0x15, 0xae, 0xa6, 0xd3, 0xf4, 0xac, 0x0b, 0x00, 0xcf, 0x6c, 0xe2, 0x58, 0xd1, 0x90, 0x34,
0x27, 0x28, 0xe2, 0xf3, 0x2e, 0x68, 0xe4, 0x39, 0xf3, 0xcd, 0x5a, 0xc7, 0xf4, 0xcd, 0x36, 0x2d,
0x4d, 0x8f, 0x1a, 0x45, 0xe6, 0xc5, 0xb4, 0x7d, 0x31, 0x4b, 0xff, 0x27, 0x4f, 0x2f, 0x02, 0x7b,
0x9b, 0x74, 0x89, 0x2f, 0x00, 0x08, 0xdb, 0x95, 0x9f, 0xa7, 0xe5, 0x67, 0x41, 0xe9, 0xc5, 0xe7,
0xa2, 0x10, 0x41, 0xca, 0xd3, 0xe1, 0xcb, 0x26, 0xe6, 0xa0, 0xc4, 0x9c, 0x01, 0xde, 0xf1, 0x2d,
0xc8, 0x07, 0x8a, 0xcd, 0x8e, 0xaa, 0xd8, 0x60, 0x82, 0xfe, 0x3b, 0x04, 0xab, 0x09, 0x9d, 0x8e,
0x63, 0xb2, 0x07, 0x80, 0xa5, 0x08, 0xd6, 0x89, 0x5c, 0xbd, 0x4b, 0x23, 0xf1, 0x78, 0x0c, 0x06,
0x49, 0x2d, 0x18, 0x4b, 0x76, 0x82, 0x42, 0xf5, 0x7f, 0x20, 0x58, 0x12, 0x7c, 0x7c, 0x37, 0x72,
0x76, 0x4f, 0xfd, 0x27, 0x08, 0x70, 0x54, 0x8e, 0x71, 0x34, 0xfd, 0x35, 0x79, 0x23, 0x4b, 0x49,
0x16, 0xb6, 0xdf, 0x56, 0xce, 0x89, 0x6c, 0x26, 0xb9, 0xf5, 0xbf, 0x23, 0x28, 0xf2, 0x14, 0xfd,
0x8c, 0xfb, 0xcf, 0xff, 0x10, 0x14, 0x2a, 0x2e, 0x25, 0x3e, 0x9b, 0xfc, 0x64, 0x0c, 0x7f, 0x15,
0x66, 0x7d, 0xef, 0xa8, 0x66, 0x99, 0xcc, 0x0c, 0x22, 0xdf, 0x39, 0x25, 0xbc, 0x1d, 0xc7, 0xab,
0x1b, 0x33, 0xbe, 0x77, 0xb4, 0x6b, 0x32, 0x13, 0xbf, 0x05, 0x73, 0x2d, 0x93, 0xb6, 0x6a, 0x1f,
0x91, 0x63, 0x5a, 0xca, 0x6f, 0x64, 0x37, 0x0b, 0xc6, 0x2c, 0x27, 0xdc, 0x27, 0xc7, 0x54, 0x7f,
0x89, 0x60, 0xa1, 0x27, 0xff, 0x38, 0x56, 0xf4, 0x36, 0xcc, 0xfb, 0xde, 0x51, 0x65, 0xb7, 0x56,
0x27, 0x4d, 0xdb, 0x0d, 0xe2, 0x0a, 0x08, 0xd2, 0x0e, 0xa7, 0x70, 0x14, 0x92, 0x81, 0xb8, 0x56,
0x70, 0xdf, 0xcd, 0x0a, 0xc2, 0x5d, 0xd7, 0xd2, 0x0f, 0xa1, 0xb8, 0xef, 0x98, 0x0d, 0xd2, 0xf2,
0x1c, 0x8b, 0xf8, 0x22, 0xb8, 0xe0, 0x22, 0x64, 0x99, 0xd9, 0x0c, 0xa2, 0x17, 0xff, 0x89, 0xbf,
0x09, 0x39, 0x76, 0xdc, 0xe9, 0x19, 0xea, 0x97, 0x94, 0x51, 0x20, 0xb2, 0xcc, 0xc1, 0x71, 0x87,
0x18, 0x62, 0x06, 0x5e, 0x83, 0xbc, 0xa8, 0xc8, 0xc9, 0xb8, 0xa6, 0x19, 0xc1, 0x48, 0x7f, 0x1a,
0xdb, 0x77, 0xcf, 0xf7, 0xba, 0x1d, 0x5c, 0x01, 0xad, 0x73, 0x42, 0xe3, 0x4a, 0x48, 0x8f, 0x39,
0x49, 0xd0, 0x46, 0x6c, 0xaa, 0xfe, 0x1f, 0x04, 0x85, 0x2a, 0x31, 0xfd, 0x46, 0xeb, 0x2c, 0x3c,
0x50, 0xb8, 0xc6, 0x2d, 0xea, 0x04, 0x3e, 0xc2, 0x7f, 0xe2, 0x6b, 0xb0, 0x14, 0x11, 0xa8, 0xd6,
0xe4, 0x0a, 0x2a, 0xe5, 0x45, 0xd9, 0xba, 0xd8, 0x49, 0x28, 0x4e, 0xbf, 0x0f, 0xb9, 0x7b, 0x36,
0x13, 0xcb, 0xf0, 0x34, 0x03, 0x89, 0x34, 0x83, 0xff, 0xc4, 0xe7, 0x22, 0x76, 0x9b, 0x11, 0x07,
0x10, 0x1a, 0xa7, 0xa8, 0x86, 0x7b, 0x7e, 0x70, 0x32, 0x19, 0x23, 0x18, 0xe9, 0xdf, 0x3f, 0xd1,
0x1c, 0xed, 0x3a, 0x8c, 0xbe, 0x9e, 0x55, 0x62, 0xc8, 0xb5, 0xec, 0xe0, 0xb1, 0xa1, 0x19, 0xe2,
0xb7, 0xfe, 0x33, 0x04, 0xda, 0x7b, 0x4e, 0x97, 0x7e, 0x1e, 0x67, 0xa2, 0x2a, 0xcc, 0x64, 0xd5,
0x85, 0x99, 0x7f, 0x65, 0x60, 0x75, 0x9f, 0xf8, 0xd4, 0xa6, 0x8c, 0xb8, 0x2c, 0x48, 0xf3, 0x2a,
0xee, 0x33, 0x2f, 0x9e, 0x2b, 0xa3, 0x44, 0xae, 0xfc, 0xd9, 0x64, 0x97, 0xdc, 0x1b, 0xbd, 0x0e,
0x71, 0x6b, 0xcc, 0x0e, 0x62, 0x4d, 0xce, 0x98, 0xe5, 0x84, 0x03, 0xbb, 0x4d, 0xb8, 0x2f, 0x53,
0x62, 0x3a, 0xc4, 0x92, 0x9f, 0xa7, 0xc5, 0x67, 0x90, 0x24, 0xc1, 0x70, 0x11, 0xb4, 0x67, 0x5c,
0x83, 0x3d, 0x8e, 0xbc, 0xe0, 0x98, 0x0f, 0x68, 0x82, 0xe5, 0x1c, 0xcc, 0xba, 0xdd, 0x76, 0xcd,
0xf7, 0x8e, 0x68, 0x69, 0x46, 0x26, 0x19, 0x6e, 0xb7, 0x6d, 0x78, 0x47, 0xc2, 0x1a, 0xda, 0xa4,
0x5d, 0xa3, 0xf6, 0x0b, 0x52, 0x9a, 0x95, 0x9f, 0xda, 0xa4, 0x5d, 0xb5, 0x5f, 0x90, 0xde, 0xeb,
0x90, 0x94, 0xe6, 0x84, 0x8b, 0xab, 0xd3, 0x8f, 0x40, 0x57, 0xb1, 0xdb, 0xe8, 0xd7, 0x08, 0xce,
0x2b, 0xb5, 0xf9, 0xfa, 0x87, 0xbc, 0x06, 0xc1, 0xa9, 0x26, 0xce, 0xf8, 0x1d, 0x48, 0x38, 0x58,
0x4a, 0x85, 0xf3, 0x37, 0x08, 0x2e, 0xa4, 0x40, 0x1a, 0x27, 0xd0, 0xde, 0x82, 0x69, 0xdb, 0x7d,
0xe6, 0xf5, 0x72, 0xa1, 0xab, 0xea, 0xb8, 0xa4, 0xdc, 0x57, 0x4e, 0xd4, 0xff, 0x8d, 0xa0, 0xf8,
0xb8, 0x4b, 0xfc, 0xe3, 0x37, 0x6d, 0x74, 0xd1, 0x83, 0xcf, 0xc5, 0x0f, 0x3e, 0x6a, 0x2e, 0xd3,
0x71, 0x73, 0x89, 0x5f, 0xe0, 0xf9, 0x01, 0xc9, 0xec, 0x4c, 0x2c, 0x99, 0xd5, 0x3f, 0x46, 0xb0,
0x9e, 0x94, 0xf3, 0xf4, 0xcc, 0xe1, 0x13, 0x04, 0xa5, 0x7e, 0x34, 0xe3, 0x58, 0xc2, 0xb7, 0xe3,
0x96, 0xa0, 0xbe, 0xa1, 0xfa, 0xb6, 0x0c, 0x8c, 0xe0, 0x25, 0x82, 0x15, 0x83, 0x34, 0xb9, 0x91,
0xf8, 0x0f, 0x6c, 0xf7, 0xa3, 0x10, 0xca, 0xd7, 0x61, 0xc6, 0xb4, 0x2c, 0x9f, 0x50, 0x3a, 0x50,
0x39, 0xb7, 0x25, 0x8f, 0xd1, 0x63, 0x8e, 0x88, 0x90, 0x19, 0x59, 0x84, 0xab, 0xb7, 0x60, 0x31,
0x71, 0x61, 0xe3, 0x59, 0xc8, 0x3d, 0x7c, 0xf4, 0xf0, 0x6e, 0x71, 0x0a, 0x2f, 0x41, 0xe1, 0x83,
0xbb, 0x77, 0x0e, 0x1e, 0x19, 0xb5, 0x9d, 0xca, 0xc3, 0xdb, 0xc6, 0x93, 0xa2, 0x85, 0x8b, 0xa0,
0x05, 0xa4, 0xf7, 0x1e, 0x3c, 0xba, 0x7d, 0x50, 0x24, 0xdb, 0x7f, 0x5b, 0x86, 0xc2, 0xfb, 0x62,
0xa3, 0x2a, 0xf1, 0x0f, 0xed, 0x06, 0xc1, 0x35, 0x28, 0x26, 0xdb, 0xbd, 0xf8, 0xba, 0x52, 0x37,
0x29, 0x5d, 0xe1, 0xf2, 0x20, 0xe8, 0xfa, 0x14, 0xfe, 0x10, 0x16, 0xe2, 0x7d, 0x5a, 0xac, 0x76,
0x42, 0x65, 0x33, 0x77, 0xd8, 0xe2, 0x35, 0x28, 0xc4, 0xda, 0xae, 0xf8, 0x8a, 0x72, 0x6d, 0x55,
0x6b, 0xb6, 0x7c, 0x51, 0xc9, 0x1a, 0xed, 0x9c, 0x4a, 0xf4, 0xf1, 0x2e, 0x59, 0x0a, 0x7a, 0x65,
0x2b, 0x6d, 0x18, 0x7a, 0x13, 0x96, 0xfa, 0x9a, 0x5e, 0xf8, 0x86, 0x72, 0xfd, 0xb4, 0xe6, 0xd8,
0xb0, 0x2d, 0x8e, 0x00, 0xf7, 0x37, 0x27, 0xf1, 0x4d, 0xf5, 0x09, 0xa4, 0xf5, 0x5e, 0xcb, 0x5b,
0x23, 0xf3, 0x87, 0x8a, 0x3b, 0x84, 0xf5, 0x3d, 0xc2, 0xe2, 0x3d, 0x2b, 0x9b, 0x32, 0xbb, 0x41,
0xf1, 0x35, 0xb5, 0x79, 0x29, 0xbb, 0x6d, 0xe5, 0xeb, 0xa3, 0x31, 0x87, 0xfb, 0x3a, 0xb0, 0x18,
0xef, 0x1d, 0xd1, 0x94, 0x13, 0x53, 0x76, 0xb1, 0xca, 0xd7, 0x46, 0xe2, 0x0d, 0x77, 0x7b, 0x0a,
0x8b, 0x89, 0x76, 0x51, 0x9a, 0x74, 0xca, 0xa6, 0xd2, 0xb0, 0xd3, 0x7b, 0x02, 0x85, 0x58, 0x5f,
0x27, 0xc5, 0xbc, 0x55, 0xbd, 0x9f, 0x61, 0x4b, 0x3f, 0x05, 0x2d, 0xda, 0x7e, 0xc1, 0x9b, 0x69,
0x8e, 0xd3, 0xb7, 0xf0, 0x48, 0x7e, 0xf3, 0x44, 0xfa, 0x4d, 0x38, 0x99, 0xa6, 0x6c, 0xa0, 0xe8,
0xa7, 0x0c, 0x43, 0xfe, 0xc3, 0xd0, 0x6b, 0x22, 0xab, 0x5f, 0x1f, 0xe4, 0x35, 0xaf, 0xaa, 0x1b,
0x0a, 0x6b, 0x7b, 0x84, 0xc5, 0xea, 0xf8, 0x81, 0xe9, 0xa6, 0xe4, 0x0f, 0xaa, 0x36, 0x45, 0x8a,
0x29, 0xa9, 0xbb, 0x03, 0xfa, 0x14, 0xb6, 0x61, 0x21, 0x56, 0xff, 0xa6, 0x29, 0x87, 0xad, 0xaa,
0xea, 0x97, 0xaf, 0x8e, 0xc2, 0x1a, 0x6e, 0xf5, 0x5d, 0x98, 0x8f, 0xd4, 0x2f, 0xf1, 0xe5, 0x01,
0x16, 0x1b, 0xad, 0x57, 0x0c, 0x53, 0x5b, 0x0b, 0x0a, 0xb1, 0x92, 0x56, 0x9a, 0xb5, 0x2a, 0x4a,
0x89, 0x29, 0x02, 0x28, 0x2b, 0x64, 0xfa, 0x14, 0xae, 0x43, 0x61, 0x8f, 0xb0, 0x93, 0x2a, 0x0b,
0x7e, 0x27, 0xbd, 0xc6, 0x15, 0xad, 0x5d, 0x95, 0x2f, 0x0f, 0xe5, 0x0b, 0xf7, 0x78, 0x0c, 0x73,
0x61, 0xc1, 0x06, 0x5f, 0x4a, 0xf5, 0xbb, 0x57, 0x51, 0x50, 0x15, 0xf2, 0xb2, 0x78, 0x80, 0xf5,
0x14, 0x1c, 0x91, 0xca, 0x4a, 0xf9, 0x8b, 0x03, 0x79, 0x42, 0x9c, 0x06, 0xe4, 0xe5, 0xd3, 0x2f,
0x65, 0xd1, 0xd8, 0x8b, 0xba, 0x3c, 0x98, 0x47, 0xbc, 0x1d, 0xf5, 0x29, 0x5c, 0x81, 0x69, 0xf1,
0xe6, 0xc3, 0x6a, 0x5f, 0x8f, 0xbe, 0x07, 0x87, 0xc9, 0xfc, 0x18, 0xb4, 0x3d, 0xc2, 0x76, 0xad,
0x3b, 0x2d, 0xd3, 0x75, 0x89, 0x83, 0xcb, 0x4a, 0xf6, 0xbb, 0xed, 0x0e, 0x3b, 0x4e, 0x91, 0x38,
0xfe, 0x87, 0x23, 0x7d, 0x0a, 0xbf, 0x44, 0x50, 0xe2, 0xfe, 0xa9, 0x7c, 0x0e, 0x7e, 0xe5, 0x15,
0x32, 0xfc, 0x40, 0x82, 0xed, 0x57, 0x99, 0x12, 0xa2, 0x60, 0xb0, 0xbc, 0x47, 0x58, 0xdf, 0xcb,
0xe0, 0xfa, 0x68, 0x79, 0x65, 0xb0, 0xf5, 0x8d, 0x11, 0xb9, 0x7b, 0xbb, 0x6e, 0x37, 0x41, 0xdb,
0xf7, 0xbd, 0xe7, 0xc7, 0xbd, 0xf4, 0xed, 0x7b, 0xa0, 0x45, 0xf3, 0xd2, 0x81, 0xea, 0xbd, 0x92,
0x12, 0x23, 0xfb, 0xd3, 0x5a, 0x7d, 0x6a, 0x67, 0xe7, 0x07, 0xb7, 0x9a, 0x36, 0x6b, 0x75, 0xeb,
0x7c, 0x8d, 0xad, 0x17, 0xb6, 0xe3, 0xd8, 0x2f, 0x18, 0x69, 0xb4, 0xb6, 0xe4, 0xb4, 0x1b, 0x96,
0x4d, 0x99, 0x6f, 0xd7, 0xbb, 0x8c, 0x58, 0x5b, 0xb6, 0xcb, 0x88, 0xef, 0x9a, 0xce, 0x96, 0x58,
0x38, 0xe0, 0xe8, 0xd4, 0xeb, 0x79, 0x31, 0x7e, 0xf7, 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x2f,
0xd0, 0x27, 0x0f, 0x93, 0x28, 0x00, 0x00,
// 1993 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x5f, 0x6f, 0x1b, 0x4b,
0x15, 0xcf, 0xd8, 0x8e, 0x93, 0x9c, 0xac, 0x13, 0x67, 0xf2, 0xcf, 0xf5, 0x6d, 0xb9, 0xe9, 0x42,
0x6f, 0xd3, 0xbf, 0x81, 0x5c, 0xfe, 0x0a, 0x21, 0xb5, 0x69, 0x7a, 0x53, 0xab, 0xbd, 0x6d, 0xba,
0x0e, 0x17, 0xca, 0x55, 0x65, 0xd6, 0xde, 0xa9, 0xbd, 0xdc, 0xf5, 0xae, 0xd9, 0x19, 0x27, 0x4d,
0x9f, 0x10, 0x45, 0x20, 0x71, 0xaf, 0x10, 0x4f, 0x20, 0x5e, 0x91, 0x78, 0x45, 0x70, 0x41, 0x7c,
0x02, 0x90, 0x90, 0xf8, 0x1c, 0x3c, 0x21, 0x3e, 0x02, 0x12, 0x9a, 0x99, 0xf5, 0x66, 0x77, 0x3d,
0x6b, 0xbb, 0xf5, 0xed, 0x8d, 0xf3, 0xe6, 0x39, 0x7b, 0x66, 0xe6, 0x77, 0xce, 0x9c, 0x73, 0xe6,
0xcc, 0x39, 0x06, 0xad, 0x6d, 0x3b, 0x87, 0x5d, 0x7a, 0xb3, 0xe3, 0x7b, 0xcc, 0xc3, 0xcb, 0xd1,
0xd1, 0x4d, 0x39, 0x28, 0x6b, 0x0d, 0xaf, 0xdd, 0xf6, 0x5c, 0x49, 0x2c, 0x6b, 0xb4, 0xd1, 0x22,
0x6d, 0x53, 0x8e, 0xf4, 0x3f, 0x20, 0x58, 0xbf, 0xe3, 0x13, 0x93, 0x91, 0x3b, 0x9e, 0xe3, 0x90,
0x06, 0xb3, 0x3d, 0xd7, 0x20, 0x3f, 0xee, 0x12, 0xca, 0xf0, 0x97, 0x21, 0x57, 0x37, 0x29, 0x29,
0xa1, 0x0d, 0xb4, 0x39, 0xbf, 0x7d, 0xfe, 0x66, 0x6c, 0xed, 0x60, 0xcd, 0xf7, 0x69, 0x73, 0xc7,
0xa4, 0xc4, 0x10, 0x9c, 0x78, 0x1d, 0x66, 0xac, 0x7a, 0xcd, 0x35, 0xdb, 0xa4, 0x94, 0xd9, 0x40,
0x9b, 0x73, 0x46, 0xde, 0xaa, 0x3f, 0x34, 0xdb, 0x04, 0x5f, 0x86, 0xc5, 0x46, 0xb8, 0xbe, 0x64,
0xc8, 0x0a, 0x86, 0x85, 0x13, 0xb2, 0x60, 0x5c, 0x83, 0xbc, 0xc4, 0x57, 0xca, 0x6d, 0xa0, 0x4d,
0xcd, 0x08, 0x46, 0xfa, 0xc7, 0x08, 0x56, 0x77, 0x7d, 0xaf, 0x33, 0x11, 0x28, 0xf5, 0x5f, 0x22,
0x58, 0xb9, 0x67, 0xd2, 0xc9, 0x00, 0xf3, 0x04, 0xb4, 0x1d, 0xcf, 0x73, 0x0c, 0x42, 0x3b, 0x9e,
0x4b, 0x09, 0x7e, 0x17, 0xf2, 0x94, 0x99, 0xac, 0x4b, 0x03, 0x14, 0x6f, 0x29, 0x51, 0x54, 0x05,
0x8b, 0x11, 0xb0, 0xe2, 0x15, 0x98, 0x3e, 0x34, 0x9d, 0xae, 0x04, 0x31, 0x6b, 0xc8, 0x81, 0xfe,
0x21, 0x2c, 0x54, 0x99, 0x6f, 0xbb, 0xcd, 0xcf, 0x70, 0xf1, 0xb9, 0xde, 0xe2, 0x7f, 0x41, 0x70,
0x6e, 0x97, 0xd0, 0x86, 0x6f, 0xd7, 0x27, 0xc4, 0xf8, 0x74, 0xd0, 0x4e, 0x28, 0x95, 0x5d, 0x61,
0x82, 0x59, 0x23, 0x46, 0xd3, 0xff, 0x8a, 0xa0, 0xac, 0x42, 0x3d, 0x8e, 0x7e, 0xbe, 0x13, 0x1a,
0x7d, 0x46, 0x4c, 0xba, 0x14, 0x9f, 0x14, 0x38, 0xec, 0xc9, 0x6e, 0x55, 0x41, 0xe8, 0xf9, 0x46,
0x1f, 0xec, 0xac, 0x02, 0x36, 0xf7, 0x9f, 0x07, 0x9e, 0x69, 0x4d, 0x86, 0xc9, 0xfe, 0x0a, 0x41,
0xc9, 0x20, 0x0e, 0x31, 0xe9, 0x64, 0x9c, 0xbc, 0xfe, 0x09, 0x82, 0xb5, 0x88, 0x7e, 0x99, 0xc9,
0xe8, 0x69, 0xc2, 0xf9, 0x05, 0x8f, 0xca, 0x49, 0x38, 0xe3, 0x58, 0xd8, 0x37, 0x60, 0x9a, 0xff,
0xa2, 0xa5, 0xcc, 0x46, 0x76, 0x73, 0x7e, 0xfb, 0xa2, 0x72, 0xce, 0x7d, 0x72, 0xfc, 0x01, 0xf7,
0xcc, 0x7d, 0xd3, 0xf6, 0x0d, 0xc9, 0xaf, 0xd7, 0x61, 0xb5, 0xda, 0xf2, 0x8e, 0xde, 0xe4, 0x29,
0xe9, 0xcf, 0x61, 0x2d, 0xb9, 0xc7, 0x38, 0xb2, 0x5e, 0x81, 0x62, 0x42, 0xcb, 0x52, 0xec, 0x39,
0x63, 0x31, 0xae, 0x66, 0xca, 0x43, 0xd0, 0x9a, 0xbc, 0xfd, 0xf6, 0x4d, 0x9f, 0xd9, 0xa7, 0x1d,
0x7f, 0x2e, 0xc1, 0x42, 0xa7, 0x87, 0x43, 0xf2, 0xe5, 0x04, 0x5f, 0x21, 0xa4, 0x0a, 0x7d, 0xfd,
0x19, 0xc1, 0x0a, 0xbf, 0x0b, 0xcf, 0x12, 0xe6, 0x3f, 0x21, 0x58, 0xbe, 0x67, 0xd2, 0xb3, 0x04,
0xf9, 0x53, 0x04, 0xcb, 0x3c, 0x64, 0x4a, 0xcc, 0xa7, 0x0b, 0xf9, 0x32, 0x2c, 0xc6, 0x21, 0xd3,
0x52, 0x4e, 0x98, 0xf4, 0x42, 0x0c, 0x33, 0xd5, 0xff, 0x86, 0x60, 0x3d, 0x88, 0xac, 0x13, 0xa1,
0xeb, 0x91, 0x81, 0x7f, 0x8a, 0x60, 0x35, 0x44, 0x7c, 0xda, 0x01, 0x78, 0x54, 0x13, 0xf9, 0x39,
0x82, 0xb5, 0x24, 0xe8, 0x53, 0x09, 0xd3, 0x7f, 0x44, 0xb0, 0xc2, 0x63, 0xe8, 0x44, 0x9c, 0xf9,
0x28, 0x69, 0xd4, 0xef, 0x90, 0xbc, 0x58, 0x22, 0x80, 0xc7, 0x51, 0x9c, 0xc2, 0xcc, 0x32, 0x2a,
0x33, 0xe3, 0xd8, 0x42, 0x4a, 0x65, 0x97, 0x96, 0xb2, 0x1b, 0x59, 0x8e, 0x2d, 0x4a, 0x13, 0xc9,
0x40, 0x2f, 0xc5, 0xab, 0x92, 0x66, 0x9b, 0xb8, 0xec, 0xf5, 0xd5, 0x99, 0x54, 0x46, 0xa6, 0x5f,
0x19, 0xf8, 0x3c, 0xcc, 0x51, 0xb9, 0x4f, 0x98, 0xbd, 0x9d, 0x10, 0xf4, 0x9f, 0x22, 0x58, 0xef,
0x83, 0x33, 0x8e, 0xb2, 0x4a, 0x30, 0x63, 0xbb, 0x16, 0x79, 0x1e, 0xa2, 0xe9, 0x0d, 0xf9, 0x97,
0x7a, 0xd7, 0x76, 0xac, 0x10, 0x46, 0x6f, 0xc8, 0x75, 0x82, 0xf9, 0x79, 0x7d, 0x2e, 0xfa, 0xd8,
0x80, 0xf9, 0xc8, 0x81, 0x04, 0x50, 0xa2, 0x24, 0xfd, 0x47, 0xb0, 0x1c, 0x43, 0x33, 0x8e, 0x3a,
0xbe, 0x00, 0x10, 0x2a, 0x5b, 0x9a, 0x4d, 0xd6, 0x88, 0x50, 0xf4, 0xff, 0x22, 0xc0, 0x32, 0x49,
0xa8, 0x70, 0x35, 0x9d, 0xa6, 0x67, 0x5d, 0x00, 0x78, 0x66, 0x13, 0xc7, 0x8a, 0x86, 0xa4, 0x39,
0x41, 0x11, 0x9f, 0x77, 0x41, 0x23, 0xcf, 0x99, 0x6f, 0xd6, 0x3a, 0xa6, 0x6f, 0xb6, 0x69, 0x69,
0x7a, 0xd4, 0x28, 0x32, 0x2f, 0xa6, 0xed, 0x8b, 0x59, 0xfa, 0x3f, 0x79, 0x7a, 0x11, 0xd8, 0xdb,
0xa4, 0x4b, 0x7c, 0x01, 0x40, 0xd8, 0xae, 0xfc, 0x3c, 0x2d, 0x3f, 0x0b, 0x4a, 0x2f, 0x3e, 0x17,
0x85, 0x08, 0x52, 0x9e, 0x0e, 0x5f, 0x36, 0x31, 0x07, 0x25, 0xe6, 0x0c, 0xf0, 0x8e, 0x6f, 0x41,
0x3e, 0x50, 0x6c, 0x76, 0x54, 0xc5, 0x06, 0x13, 0xf4, 0xdf, 0x23, 0x58, 0x4d, 0xe8, 0x74, 0x1c,
0x93, 0x3d, 0x00, 0x2c, 0x45, 0xb0, 0x4e, 0xe4, 0xea, 0x5d, 0x1a, 0x89, 0xc7, 0x63, 0x30, 0x48,
0x6a, 0xc1, 0x58, 0xb2, 0x13, 0x14, 0xaa, 0xff, 0x03, 0xc1, 0x92, 0xe0, 0xe3, 0xbb, 0x91, 0xb3,
0x7b, 0xea, 0x3f, 0x41, 0x80, 0xa3, 0x72, 0x8c, 0xa3, 0xe9, 0xaf, 0xc9, 0x1b, 0x59, 0x4a, 0xb2,
0xb0, 0xfd, 0xb6, 0x72, 0x4e, 0x64, 0x33, 0xc9, 0xad, 0xff, 0x1d, 0x41, 0x91, 0xa7, 0xe8, 0x67,
0xdc, 0x7f, 0xfe, 0x87, 0xa0, 0x50, 0x71, 0x29, 0xf1, 0xd9, 0xe4, 0x27, 0x63, 0xf8, 0xab, 0x30,
0xeb, 0x7b, 0x47, 0x35, 0xcb, 0x64, 0x66, 0x10, 0xf9, 0xce, 0x29, 0xe1, 0xed, 0x38, 0x5e, 0xdd,
0x98, 0xf1, 0xbd, 0xa3, 0x5d, 0x93, 0x99, 0xf8, 0x2d, 0x98, 0x6b, 0x99, 0xb4, 0x55, 0xfb, 0x88,
0x1c, 0xd3, 0x52, 0x7e, 0x23, 0xbb, 0x59, 0x30, 0x66, 0x39, 0xe1, 0x3e, 0x39, 0xa6, 0xfa, 0x4b,
0x04, 0x0b, 0x3d, 0xf9, 0xc7, 0xb1, 0xa2, 0xb7, 0x61, 0xde, 0xf7, 0x8e, 0x2a, 0xbb, 0xb5, 0x3a,
0x69, 0xda, 0x6e, 0x10, 0x57, 0x40, 0x90, 0x76, 0x38, 0x85, 0xa3, 0x90, 0x0c, 0xc4, 0xb5, 0x82,
0xfb, 0x6e, 0x56, 0x10, 0xee, 0xba, 0x96, 0x7e, 0x08, 0xc5, 0x7d, 0xc7, 0x6c, 0x90, 0x96, 0xe7,
0x58, 0xc4, 0x17, 0xc1, 0x05, 0x17, 0x21, 0xcb, 0xcc, 0x66, 0x10, 0xbd, 0xf8, 0x4f, 0xfc, 0x4d,
0xc8, 0xb1, 0xe3, 0x4e, 0xcf, 0x50, 0xbf, 0xa4, 0x8c, 0x02, 0x91, 0x65, 0x0e, 0x8e, 0x3b, 0xc4,
0x10, 0x33, 0xf0, 0x1a, 0xe4, 0x45, 0x45, 0x4e, 0xc6, 0x35, 0xcd, 0x08, 0x46, 0xfa, 0xd3, 0xd8,
0xbe, 0x7b, 0xbe, 0xd7, 0xed, 0xe0, 0x0a, 0x68, 0x9d, 0x13, 0x1a, 0x57, 0x42, 0x7a, 0xcc, 0x49,
0x82, 0x36, 0x62, 0x53, 0xf5, 0xff, 0x20, 0x28, 0x54, 0x89, 0xe9, 0x37, 0x5a, 0x67, 0xe1, 0x81,
0xc2, 0x35, 0x6e, 0x51, 0x27, 0xf0, 0x11, 0xfe, 0x13, 0x5f, 0x83, 0xa5, 0x88, 0x40, 0xb5, 0x26,
0x57, 0x50, 0x29, 0x2f, 0xca, 0xd6, 0xc5, 0x4e, 0x42, 0x71, 0xfa, 0x7d, 0xc8, 0xdd, 0xb3, 0x99,
0x58, 0x86, 0xa7, 0x19, 0x48, 0xa4, 0x19, 0xfc, 0x27, 0x3e, 0x17, 0xb1, 0xdb, 0x8c, 0x38, 0x80,
0xd0, 0x38, 0x45, 0x35, 0xdc, 0xf3, 0x83, 0x93, 0xc9, 0x18, 0xc1, 0x48, 0xff, 0xfe, 0x89, 0xe6,
0x68, 0xd7, 0x61, 0xf4, 0xf5, 0xac, 0x12, 0x43, 0xae, 0x65, 0x07, 0x8f, 0x0d, 0xcd, 0x10, 0xbf,
0xf5, 0x9f, 0x21, 0xd0, 0xde, 0x73, 0xba, 0xf4, 0x4d, 0x9c, 0x89, 0xaa, 0x30, 0x93, 0x55, 0x17,
0x66, 0xfe, 0x95, 0x81, 0xd5, 0x7d, 0xe2, 0x53, 0x9b, 0x32, 0xe2, 0xb2, 0x20, 0xcd, 0xab, 0xb8,
0xcf, 0xbc, 0x78, 0xae, 0x8c, 0x12, 0xb9, 0xf2, 0x67, 0x93, 0x5d, 0x72, 0x6f, 0xf4, 0x3a, 0xc4,
0xad, 0x31, 0x3b, 0x88, 0x35, 0x39, 0x63, 0x96, 0x13, 0x0e, 0xec, 0x36, 0xe1, 0xbe, 0x4c, 0x89,
0xe9, 0x10, 0x4b, 0x7e, 0x9e, 0x16, 0x9f, 0x41, 0x92, 0x04, 0xc3, 0x45, 0xd0, 0x9e, 0x71, 0x0d,
0xf6, 0x38, 0xf2, 0x82, 0x63, 0x3e, 0xa0, 0x09, 0x96, 0x73, 0x30, 0xeb, 0x76, 0xdb, 0x35, 0xdf,
0x3b, 0xa2, 0xa5, 0x19, 0x99, 0x64, 0xb8, 0xdd, 0xb6, 0xe1, 0x1d, 0x09, 0x6b, 0x68, 0x93, 0x76,
0x8d, 0xda, 0x2f, 0x48, 0x69, 0x56, 0x7e, 0x6a, 0x93, 0x76, 0xd5, 0x7e, 0x41, 0x7a, 0xaf, 0x43,
0x52, 0x9a, 0x13, 0x2e, 0xae, 0x4e, 0x3f, 0x02, 0x5d, 0xc5, 0x6e, 0xa3, 0x5f, 0x23, 0x38, 0xaf,
0xd4, 0xe6, 0xeb, 0x1f, 0xf2, 0x1a, 0x04, 0xa7, 0x9a, 0x38, 0xe3, 0x77, 0x20, 0xe1, 0x60, 0x29,
0x15, 0xce, 0xdf, 0x20, 0xb8, 0x90, 0x02, 0x69, 0x9c, 0x40, 0x7b, 0x0b, 0xa6, 0x6d, 0xf7, 0x99,
0xd7, 0xcb, 0x85, 0xae, 0xaa, 0xe3, 0x92, 0x72, 0x5f, 0x39, 0x51, 0xff, 0x37, 0x82, 0xe2, 0xe3,
0x2e, 0xf1, 0x8f, 0x3f, 0x6f, 0xa3, 0x8b, 0x1e, 0x7c, 0x2e, 0x7e, 0xf0, 0x51, 0x73, 0x99, 0x8e,
0x9b, 0x4b, 0xfc, 0x02, 0xcf, 0x0f, 0x48, 0x66, 0x67, 0x62, 0xc9, 0xac, 0xfe, 0x31, 0x82, 0xf5,
0xa4, 0x9c, 0xa7, 0x67, 0x0e, 0x9f, 0x20, 0x28, 0xf5, 0xa3, 0x19, 0xc7, 0x12, 0xbe, 0x1d, 0xb7,
0x04, 0xf5, 0x0d, 0xd5, 0xb7, 0x65, 0x60, 0x04, 0x2f, 0x11, 0xac, 0x18, 0xa4, 0xc9, 0x8d, 0xc4,
0x7f, 0x60, 0xbb, 0x1f, 0x85, 0x50, 0xbe, 0x0e, 0x33, 0xa6, 0x65, 0xf9, 0x84, 0xd2, 0x81, 0xca,
0xb9, 0x2d, 0x79, 0x8c, 0x1e, 0x73, 0x44, 0x84, 0xcc, 0xc8, 0x22, 0x5c, 0xbd, 0x05, 0x8b, 0x89,
0x0b, 0x1b, 0xcf, 0x42, 0xee, 0xe1, 0xa3, 0x87, 0x77, 0x8b, 0x53, 0x78, 0x09, 0x0a, 0x1f, 0xdc,
0xbd, 0x73, 0xf0, 0xc8, 0xa8, 0xed, 0x54, 0x1e, 0xde, 0x36, 0x9e, 0x14, 0x2d, 0x5c, 0x04, 0x2d,
0x20, 0xbd, 0xf7, 0xe0, 0xd1, 0xed, 0x83, 0x22, 0xd9, 0xfe, 0xed, 0x0a, 0x14, 0xde, 0x17, 0x1b,
0x55, 0x89, 0x7f, 0x68, 0x37, 0x08, 0xae, 0x41, 0x31, 0xd9, 0xee, 0xc5, 0xd7, 0x95, 0xba, 0x49,
0xe9, 0x0a, 0x97, 0x07, 0x41, 0xd7, 0xa7, 0xf0, 0x87, 0xb0, 0x10, 0xef, 0xd3, 0x62, 0xb5, 0x13,
0x2a, 0x9b, 0xb9, 0xc3, 0x16, 0xaf, 0x41, 0x21, 0xd6, 0x76, 0xc5, 0x57, 0x94, 0x6b, 0xab, 0x5a,
0xb3, 0xe5, 0x8b, 0x4a, 0xd6, 0x68, 0xe7, 0x54, 0xa2, 0x8f, 0x77, 0xc9, 0x52, 0xd0, 0x2b, 0x5b,
0x69, 0xc3, 0xd0, 0x9b, 0xb0, 0xd4, 0xd7, 0xf4, 0xc2, 0x37, 0x94, 0xeb, 0xa7, 0x35, 0xc7, 0x86,
0x6d, 0x71, 0x04, 0xb8, 0xbf, 0x39, 0x89, 0x6f, 0xaa, 0x4f, 0x20, 0xad, 0xf7, 0x5a, 0xde, 0x1a,
0x99, 0x3f, 0x54, 0xdc, 0x21, 0xac, 0xef, 0x11, 0x16, 0xef, 0x59, 0xd9, 0x94, 0xd9, 0x0d, 0x8a,
0xaf, 0xa9, 0xcd, 0x4b, 0xd9, 0x6d, 0x2b, 0x5f, 0x1f, 0x8d, 0x39, 0xdc, 0xd7, 0x81, 0xc5, 0x78,
0xef, 0x88, 0xa6, 0x9c, 0x98, 0xb2, 0x8b, 0x55, 0xbe, 0x36, 0x12, 0x6f, 0xb8, 0xdb, 0x53, 0x58,
0x4c, 0xb4, 0x8b, 0xd2, 0xa4, 0x53, 0x36, 0x95, 0x86, 0x9d, 0xde, 0x13, 0x28, 0xc4, 0xfa, 0x3a,
0x29, 0xe6, 0xad, 0xea, 0xfd, 0x0c, 0x5b, 0xfa, 0x29, 0x68, 0xd1, 0xf6, 0x0b, 0xde, 0x4c, 0x73,
0x9c, 0xbe, 0x85, 0x47, 0xf2, 0x9b, 0x27, 0xd2, 0x6f, 0xc2, 0xc9, 0x34, 0x65, 0x03, 0x45, 0x3f,
0x65, 0x18, 0xf2, 0x1f, 0x86, 0x5e, 0x13, 0x59, 0xfd, 0xfa, 0x20, 0xaf, 0x79, 0x55, 0xdd, 0x50,
0x58, 0xdb, 0x23, 0x2c, 0x56, 0xc7, 0x0f, 0x4c, 0x37, 0x25, 0x7f, 0x50, 0xb5, 0x29, 0x52, 0x4c,
0x49, 0xdd, 0x1d, 0xd0, 0xa7, 0xb0, 0x0d, 0x0b, 0xb1, 0xfa, 0x37, 0x4d, 0x39, 0x6c, 0x55, 0x55,
0xbf, 0x7c, 0x75, 0x14, 0xd6, 0x70, 0xab, 0xef, 0xc2, 0x7c, 0xa4, 0x7e, 0x89, 0x2f, 0x0f, 0xb0,
0xd8, 0x68, 0xbd, 0x62, 0x98, 0xda, 0x5a, 0x50, 0x88, 0x95, 0xb4, 0xd2, 0xac, 0x55, 0x51, 0x4a,
0x4c, 0x11, 0x40, 0x59, 0x21, 0xd3, 0xa7, 0x70, 0x1d, 0x0a, 0x7b, 0x84, 0x9d, 0x54, 0x59, 0xf0,
0x3b, 0xe9, 0x35, 0xae, 0x68, 0xed, 0xaa, 0x7c, 0x79, 0x28, 0x5f, 0xb8, 0xc7, 0x63, 0x98, 0x0b,
0x0b, 0x36, 0xf8, 0x52, 0xaa, 0xdf, 0xbd, 0x8a, 0x82, 0xaa, 0x90, 0x97, 0xc5, 0x03, 0xac, 0xa7,
0xe0, 0x88, 0x54, 0x56, 0xca, 0x5f, 0x1c, 0xc8, 0x13, 0xe2, 0x34, 0x20, 0x2f, 0x9f, 0x7e, 0x29,
0x8b, 0xc6, 0x5e, 0xd4, 0xe5, 0xc1, 0x3c, 0xe2, 0xed, 0xa8, 0x4f, 0xe1, 0x0a, 0x4c, 0x8b, 0x37,
0x1f, 0x56, 0xfb, 0x7a, 0xf4, 0x3d, 0x38, 0x4c, 0xe6, 0xc7, 0xa0, 0xed, 0x11, 0xb6, 0x6b, 0xdd,
0x69, 0x99, 0xae, 0x4b, 0x1c, 0x5c, 0x56, 0xb2, 0xdf, 0x6d, 0x77, 0xd8, 0x71, 0x8a, 0xc4, 0xf1,
0x3f, 0x1c, 0xe9, 0x53, 0xf8, 0x25, 0x82, 0x12, 0xf7, 0x4f, 0xe5, 0x73, 0xf0, 0x2b, 0xaf, 0x90,
0xe1, 0x07, 0x12, 0x6c, 0xbf, 0xca, 0x94, 0x10, 0x05, 0x83, 0xe5, 0x3d, 0xc2, 0xfa, 0x5e, 0x06,
0xd7, 0x47, 0xcb, 0x2b, 0x83, 0xad, 0x6f, 0x8c, 0xc8, 0x1d, 0xee, 0xfa, 0x3d, 0xd0, 0xa2, 0x79,
0xe8, 0x40, 0x75, 0x5e, 0x49, 0x89, 0x89, 0xfd, 0x69, 0xac, 0x3e, 0xb5, 0xdd, 0x04, 0x6d, 0xdf,
0xf7, 0x9e, 0x1f, 0xf7, 0xf2, 0xc2, 0x37, 0xb5, 0xd1, 0xce, 0xce, 0x0f, 0x6e, 0x35, 0x6d, 0xd6,
0xea, 0xd6, 0xf9, 0x1a, 0x5b, 0x2f, 0x6c, 0xc7, 0xb1, 0x5f, 0x30, 0xd2, 0x68, 0x6d, 0xc9, 0x69,
0x37, 0x2c, 0x9b, 0x32, 0xdf, 0xae, 0x77, 0x19, 0xb1, 0xb6, 0x6c, 0x97, 0x11, 0xdf, 0x35, 0x9d,
0x2d, 0xb1, 0x70, 0xc0, 0xd1, 0xa9, 0xd7, 0xf3, 0x62, 0xfc, 0xee, 0xff, 0x03, 0x00, 0x00, 0xff,
0xff, 0xc1, 0x29, 0x3b, 0x4a, 0xec, 0x28, 0x00, 0x00,
}
// Reference imports to suppress errors if they are not otherwise used.
@ -3061,6 +3061,7 @@ type MilvusServiceClient interface {
GetDdChannel(ctx context.Context, in *commonpb.Empty, opts ...grpc.CallOption) (*StringResponse, error)
GetPersistentSegmentInfo(ctx context.Context, in *PersistentSegmentInfoRequest, opts ...grpc.CallOption) (*PersistentSegmentInfoResponse, error)
GetQuerySegmentInfo(ctx context.Context, in *QuerySegmentInfoRequest, opts ...grpc.CallOption) (*QuerySegmentInfoResponse, error)
RegisterLink(ctx context.Context, in *commonpb.Empty, opts ...grpc.CallOption) (*RegisterLinkResponse, error)
}
type milvusServiceClient struct {
@ -3296,6 +3297,15 @@ func (c *milvusServiceClient) GetQuerySegmentInfo(ctx context.Context, in *Query
return out, nil
}
func (c *milvusServiceClient) RegisterLink(ctx context.Context, in *commonpb.Empty, opts ...grpc.CallOption) (*RegisterLinkResponse, error) {
out := new(RegisterLinkResponse)
err := c.cc.Invoke(ctx, "/milvus.proto.milvus.MilvusService/RegisterLink", in, out, opts...)
if err != nil {
return nil, err
}
return out, nil
}
// MilvusServiceServer is the server API for MilvusService service.
type MilvusServiceServer interface {
CreateCollection(context.Context, *CreateCollectionRequest) (*commonpb.Status, error)
@ -3323,6 +3333,7 @@ type MilvusServiceServer interface {
GetDdChannel(context.Context, *commonpb.Empty) (*StringResponse, error)
GetPersistentSegmentInfo(context.Context, *PersistentSegmentInfoRequest) (*PersistentSegmentInfoResponse, error)
GetQuerySegmentInfo(context.Context, *QuerySegmentInfoRequest) (*QuerySegmentInfoResponse, error)
RegisterLink(context.Context, *commonpb.Empty) (*RegisterLinkResponse, error)
}
// UnimplementedMilvusServiceServer can be embedded to have forward compatible implementations.
@ -3404,6 +3415,9 @@ func (*UnimplementedMilvusServiceServer) GetPersistentSegmentInfo(ctx context.Co
func (*UnimplementedMilvusServiceServer) GetQuerySegmentInfo(ctx context.Context, req *QuerySegmentInfoRequest) (*QuerySegmentInfoResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method GetQuerySegmentInfo not implemented")
}
func (*UnimplementedMilvusServiceServer) RegisterLink(ctx context.Context, req *commonpb.Empty) (*RegisterLinkResponse, error) {
return nil, status.Errorf(codes.Unimplemented, "method RegisterLink not implemented")
}
func RegisterMilvusServiceServer(s *grpc.Server, srv MilvusServiceServer) {
s.RegisterService(&_MilvusService_serviceDesc, srv)
@ -3859,6 +3873,24 @@ func _MilvusService_GetQuerySegmentInfo_Handler(srv interface{}, ctx context.Con
return interceptor(ctx, in, info, handler)
}
func _MilvusService_RegisterLink_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) {
in := new(commonpb.Empty)
if err := dec(in); err != nil {
return nil, err
}
if interceptor == nil {
return srv.(MilvusServiceServer).RegisterLink(ctx, in)
}
info := &grpc.UnaryServerInfo{
Server: srv,
FullMethod: "/milvus.proto.milvus.MilvusService/RegisterLink",
}
handler := func(ctx context.Context, req interface{}) (interface{}, error) {
return srv.(MilvusServiceServer).RegisterLink(ctx, req.(*commonpb.Empty))
}
return interceptor(ctx, in, info, handler)
}
var _MilvusService_serviceDesc = grpc.ServiceDesc{
ServiceName: "milvus.proto.milvus.MilvusService",
HandlerType: (*MilvusServiceServer)(nil),
@ -3963,6 +3995,10 @@ var _MilvusService_serviceDesc = grpc.ServiceDesc{
MethodName: "GetQuerySegmentInfo",
Handler: _MilvusService_GetQuerySegmentInfo_Handler,
},
{
MethodName: "RegisterLink",
Handler: _MilvusService_RegisterLink_Handler,
},
},
Streams: []grpc.StreamDesc{},
Metadata: "milvus.proto",

22
internal/proxynode/impl.go
View File

@ -21,7 +21,7 @@ const (
)
func (node *NodeImpl) UpdateStateCode(code internalpb2.StateCode) {
node.stateCode = code
node.stateCode.Store(code)
}
func (node *NodeImpl) InvalidateCollectionMetaCache(ctx context.Context, request *proxypb.InvalidateCollMetaCacheRequest) (*commonpb.Status, error) {
@ -896,3 +896,23 @@ func (node *NodeImpl) getSegmentsOfCollection(ctx context.Context, dbName string
}
return ret, nil
}
func (node *NodeImpl) RegisterLink(request *commonpb.Empty) (*milvuspb.RegisterLinkResponse, error) {
code := node.stateCode.Load().(internalpb2.StateCode)
if code != internalpb2.StateCode_HEALTHY {
return &milvuspb.RegisterLinkResponse{
Address: nil,
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_UNEXPECTED_ERROR,
Reason: "proxy node not healthy",
},
}, nil
}
return &milvuspb.RegisterLinkResponse{
Address: nil,
Status: &commonpb.Status{
ErrorCode: commonpb.ErrorCode_SUCCESS,
Reason: "",
},
}, nil
}

11
internal/proxynode/proxy_node.go
View File

@ -6,6 +6,7 @@ import (
"log"
"math/rand"
"sync"
"sync/atomic"
"time"
"github.com/zilliztech/milvus-distributed/internal/proto/proxypb"
@ -33,7 +34,7 @@ type NodeImpl struct {
ip string
port int
stateCode internalpb2.StateCode
stateCode atomic.Value
masterClient MasterClient
indexServiceClient IndexServiceClient
@ -65,7 +66,7 @@ func NewProxyNodeImpl(ctx context.Context, factory msgstream.Factory) (*NodeImpl
cancel: cancel,
msFactory: factory,
}
node.UpdateStateCode(internalpb2.StateCode_ABNORMAL)
return node, nil
}
@ -165,9 +166,6 @@ func (node *NodeImpl) Init() error {
Params.SearchResultChannelNames = []string{resp.ResultChannel}
}
node.UpdateStateCode(internalpb2.StateCode_HEALTHY)
log.Println("proxy node is healthy ...")
// todo
//Params.InsertChannelNames, err = node.dataServiceClient.GetInsertChannels()
//if err != nil {
@ -264,6 +262,9 @@ func (node *NodeImpl) Start() error {
cb()
}
node.UpdateStateCode(internalpb2.StateCode_HEALTHY)
log.Println("proxy node is healthy ...")
return nil
}

2
tests/python/requirements.txt
View File

@ -2,7 +2,7 @@ grpcio==1.26.0
grpcio-tools==1.26.0
numpy==1.18.1
pytest-cov==2.8.1
pymilvus-distributed==0.0.34
pymilvus-distributed==0.0.35
sklearn==0.0
pytest==4.5.0
pytest-timeout==1.3.3

2
tests/python/test_index.py
View File

@ -820,8 +820,8 @@ class TestIndexAsync:
@pytest.mark.level(2)
def test_create_index_with_invalid_collectionname(self, connect):
collection_name = " "
future = connect.create_index(collection_name, field_name, default_index, _async=True)
with pytest.raises(Exception) as e:
future = connect.create_index(collection_name, field_name, default_index, _async=True)
res = future.result()
@pytest.mark.timeout(BUILD_TIMEOUT)

2
tests/python_test/conftest.py
View File

@ -77,6 +77,7 @@ def check_server_connection(request):
@pytest.fixture(scope="module")
def connect(request):
ip = request.config.getoption("--ip")
print("[debug] ip: ", ip)
service_name = request.config.getoption("--service")
port = request.config.getoption("--port")
http_port = request.config.getoption("--http-port")
@ -85,6 +86,7 @@ def connect(request):
port = http_port
try:
milvus = get_milvus(host=ip, port=port, handler=handler)
print("[debug] collections: ", milvus.list_collections())
# reset_build_index_threshold(milvus)
except Exception as e:
logging.getLogger().error(str(e))

2
tests/python_test/requirements.txt
View File

@ -2,7 +2,7 @@ grpcio==1.26.0
grpcio-tools==1.26.0
numpy==1.18.1
pytest-cov==2.8.1
pymilvus-distributed==0.0.34
pymilvus-distributed==0.0.35
sklearn==0.0
pytest==4.5.0
pytest-timeout==1.3.3