diff options
| -rw-r--r-- | weed/pb/master.proto | 5 | ||||
| -rw-r--r-- | weed/pb/master_pb/master.pb.go | 267 | ||||
| -rw-r--r-- | weed/server/master_grpc_server.go | 18 | ||||
| -rw-r--r-- | weed/wdclient/masterclient.go | 88 |
4 files changed, 210 insertions, 168 deletions
diff --git a/weed/pb/master.proto b/weed/pb/master.proto index 7dcab40db..9cf46ab92 100644 --- a/weed/pb/master.proto +++ b/weed/pb/master.proto @@ -7,7 +7,7 @@ package master_pb; service Seaweed { rpc SendHeartbeat (stream Heartbeat) returns (stream HeartbeatResponse) { } - rpc KeepConnected (stream ClientListenRequest) returns (stream VolumeLocation) { + rpc KeepConnected (stream KeepConnectedRequest) returns (stream VolumeLocation) { } rpc LookupVolume (LookupVolumeRequest) returns (LookupVolumeResponse) { } @@ -101,7 +101,7 @@ message SuperBlockExtra { ErasureCoding erasure_coding = 1; } -message ClientListenRequest { +message KeepConnectedRequest { string name = 1; } @@ -110,6 +110,7 @@ message VolumeLocation { string public_url = 2; repeated uint32 new_vids = 3; repeated uint32 deleted_vids = 4; + string leader = 5; // optional when leader is not itself } message LookupVolumeRequest { diff --git a/weed/pb/master_pb/master.pb.go b/weed/pb/master_pb/master.pb.go index cc1766fe8..f2d9420f0 100644 --- a/weed/pb/master_pb/master.pb.go +++ b/weed/pb/master_pb/master.pb.go @@ -16,7 +16,7 @@ It has these top-level messages: VolumeEcShardInformationMessage Empty SuperBlockExtra - ClientListenRequest + KeepConnectedRequest VolumeLocation LookupVolumeRequest LookupVolumeResponse @@ -485,16 +485,16 @@ func (m *SuperBlockExtra_ErasureCoding) GetVolumeIds() []uint32 { return nil } -type ClientListenRequest struct { +type KeepConnectedRequest struct { Name string `protobuf:"bytes,1,opt,name=name" json:"name,omitempty"` } -func (m *ClientListenRequest) Reset() { *m = ClientListenRequest{} } -func (m *ClientListenRequest) String() string { return proto.CompactTextString(m) } -func (*ClientListenRequest) ProtoMessage() {} -func (*ClientListenRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } +func (m *KeepConnectedRequest) Reset() { *m = KeepConnectedRequest{} } +func (m *KeepConnectedRequest) String() string { return proto.CompactTextString(m) } +func (*KeepConnectedRequest) ProtoMessage() {} +func (*KeepConnectedRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{7} } -func (m *ClientListenRequest) GetName() string { +func (m *KeepConnectedRequest) GetName() string { if m != nil { return m.Name } @@ -506,6 +506,7 @@ type VolumeLocation struct { PublicUrl string `protobuf:"bytes,2,opt,name=public_url,json=publicUrl" json:"public_url,omitempty"` NewVids []uint32 `protobuf:"varint,3,rep,packed,name=new_vids,json=newVids" json:"new_vids,omitempty"` DeletedVids []uint32 `protobuf:"varint,4,rep,packed,name=deleted_vids,json=deletedVids" json:"deleted_vids,omitempty"` + Leader string `protobuf:"bytes,5,opt,name=leader" json:"leader,omitempty"` } func (m *VolumeLocation) Reset() { *m = VolumeLocation{} } @@ -541,6 +542,13 @@ func (m *VolumeLocation) GetDeletedVids() []uint32 { return nil } +func (m *VolumeLocation) GetLeader() string { + if m != nil { + return m.Leader + } + return "" +} + type LookupVolumeRequest struct { VolumeIds []string `protobuf:"bytes,1,rep,name=volume_ids,json=volumeIds" json:"volume_ids,omitempty"` Collection string `protobuf:"bytes,2,opt,name=collection" json:"collection,omitempty"` @@ -1327,7 +1335,7 @@ func init() { proto.RegisterType((*Empty)(nil), "master_pb.Empty") proto.RegisterType((*SuperBlockExtra)(nil), "master_pb.SuperBlockExtra") proto.RegisterType((*SuperBlockExtra_ErasureCoding)(nil), "master_pb.SuperBlockExtra.ErasureCoding") - proto.RegisterType((*ClientListenRequest)(nil), "master_pb.ClientListenRequest") + proto.RegisterType((*KeepConnectedRequest)(nil), "master_pb.KeepConnectedRequest") proto.RegisterType((*VolumeLocation)(nil), "master_pb.VolumeLocation") proto.RegisterType((*LookupVolumeRequest)(nil), "master_pb.LookupVolumeRequest") proto.RegisterType((*LookupVolumeResponse)(nil), "master_pb.LookupVolumeResponse") @@ -1428,7 +1436,7 @@ func (c *seaweedClient) KeepConnected(ctx context.Context, opts ...grpc.CallOpti } type Seaweed_KeepConnectedClient interface { - Send(*ClientListenRequest) error + Send(*KeepConnectedRequest) error Recv() (*VolumeLocation, error) grpc.ClientStream } @@ -1437,7 +1445,7 @@ type seaweedKeepConnectedClient struct { grpc.ClientStream } -func (x *seaweedKeepConnectedClient) Send(m *ClientListenRequest) error { +func (x *seaweedKeepConnectedClient) Send(m *KeepConnectedRequest) error { return x.ClientStream.SendMsg(m) } @@ -1572,7 +1580,7 @@ func _Seaweed_KeepConnected_Handler(srv interface{}, stream grpc.ServerStream) e type Seaweed_KeepConnectedServer interface { Send(*VolumeLocation) error - Recv() (*ClientListenRequest, error) + Recv() (*KeepConnectedRequest, error) grpc.ServerStream } @@ -1584,8 +1592,8 @@ func (x *seaweedKeepConnectedServer) Send(m *VolumeLocation) error { return x.ServerStream.SendMsg(m) } -func (x *seaweedKeepConnectedServer) Recv() (*ClientListenRequest, error) { - m := new(ClientListenRequest) +func (x *seaweedKeepConnectedServer) Recv() (*KeepConnectedRequest, error) { + m := new(KeepConnectedRequest) if err := x.ServerStream.RecvMsg(m); err != nil { return nil, err } @@ -1793,123 +1801,124 @@ var _Seaweed_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("master.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 1888 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x58, 0xcd, 0x6f, 0x1c, 0x49, - 0x15, 0x4f, 0xcf, 0x8c, 0xc7, 0x33, 0x6f, 0x3e, 0x3c, 0x53, 0x76, 0xbc, 0x93, 0x59, 0x92, 0x4c, - 0x7a, 0x91, 0xd6, 0x09, 0x8b, 0x59, 0xb2, 0x2b, 0x81, 0x04, 0x68, 0x95, 0x38, 0xde, 0xc5, 0xca, - 0xc7, 0x3a, 0x3d, 0x21, 0x48, 0x48, 0xa8, 0xa9, 0xe9, 0x2e, 0xdb, 0x25, 0xf7, 0x74, 0x37, 0x5d, - 0x35, 0x8e, 0x67, 0x39, 0x70, 0x80, 0x1b, 0x12, 0x17, 0xce, 0xdc, 0xf9, 0x1b, 0x38, 0x70, 0xe1, - 0xc8, 0x9d, 0x3b, 0xff, 0x02, 0x57, 0x84, 0xb4, 0xaa, 0xaf, 0xee, 0xea, 0x99, 0xb1, 0x1d, 0xaf, - 0xb4, 0x87, 0xdc, 0xaa, 0xdf, 0x7b, 0xf5, 0xde, 0xab, 0xdf, 0xab, 0xf7, 0x51, 0x0d, 0xed, 0x29, - 0x66, 0x9c, 0x64, 0xbb, 0x69, 0x96, 0xf0, 0x04, 0x35, 0xd5, 0x97, 0x9f, 0x4e, 0xdc, 0x3f, 0xd5, - 0xa1, 0xf9, 0x73, 0x82, 0x33, 0x3e, 0x21, 0x98, 0xa3, 0x2e, 0x54, 0x68, 0x3a, 0x70, 0x46, 0xce, - 0x4e, 0xd3, 0xab, 0xd0, 0x14, 0x21, 0xa8, 0xa5, 0x49, 0xc6, 0x07, 0x95, 0x91, 0xb3, 0xd3, 0xf1, - 0xe4, 0x1a, 0xdd, 0x06, 0x48, 0x67, 0x93, 0x88, 0x06, 0xfe, 0x2c, 0x8b, 0x06, 0x55, 0x29, 0xdb, - 0x54, 0x94, 0x5f, 0x64, 0x11, 0xda, 0x81, 0xde, 0x14, 0x9f, 0xfb, 0x67, 0x49, 0x34, 0x9b, 0x12, - 0x3f, 0x48, 0x66, 0x31, 0x1f, 0xd4, 0xe4, 0xf6, 0xee, 0x14, 0x9f, 0xbf, 0x96, 0xe4, 0x3d, 0x41, - 0x45, 0x23, 0xe1, 0xd5, 0xb9, 0x7f, 0x44, 0x23, 0xe2, 0x9f, 0x92, 0xf9, 0x60, 0x6d, 0xe4, 0xec, - 0xd4, 0x3c, 0x98, 0xe2, 0xf3, 0xcf, 0x69, 0x44, 0x9e, 0x92, 0x39, 0xba, 0x0b, 0xad, 0x10, 0x73, - 0xec, 0x07, 0x24, 0xe6, 0x24, 0x1b, 0xd4, 0xa5, 0x2d, 0x10, 0xa4, 0x3d, 0x49, 0x11, 0xfe, 0x65, - 0x38, 0x38, 0x1d, 0xac, 0x4b, 0x8e, 0x5c, 0x0b, 0xff, 0x70, 0x38, 0xa5, 0xb1, 0x2f, 0x3d, 0x6f, - 0x48, 0xd3, 0x4d, 0x49, 0x39, 0x14, 0xee, 0xff, 0x0c, 0xd6, 0x95, 0x6f, 0x6c, 0xd0, 0x1c, 0x55, - 0x77, 0x5a, 0x0f, 0x3f, 0xd8, 0xcd, 0xd1, 0xd8, 0x55, 0xee, 0x1d, 0xc4, 0x47, 0x49, 0x36, 0xc5, - 0x9c, 0x26, 0xf1, 0x73, 0xc2, 0x18, 0x3e, 0x26, 0x9e, 0xd9, 0x83, 0x0e, 0xa0, 0x15, 0x93, 0x37, - 0xbe, 0x51, 0x01, 0x52, 0xc5, 0xce, 0x92, 0x8a, 0xf1, 0x49, 0x92, 0xf1, 0x15, 0x7a, 0x20, 0x26, - 0x6f, 0x5e, 0x6b, 0x55, 0x2f, 0x61, 0x23, 0x24, 0x11, 0xe1, 0x24, 0xcc, 0xd5, 0xb5, 0xae, 0xa9, - 0xae, 0xab, 0x15, 0x18, 0x95, 0xdf, 0x85, 0xee, 0x09, 0x66, 0x7e, 0x9c, 0xe4, 0x1a, 0xdb, 0x23, - 0x67, 0xa7, 0xe1, 0xb5, 0x4f, 0x30, 0x7b, 0x91, 0x18, 0xa9, 0x2f, 0xa0, 0x49, 0x02, 0x9f, 0x9d, - 0xe0, 0x2c, 0x64, 0x83, 0x9e, 0x34, 0xf9, 0x60, 0xc9, 0xe4, 0x7e, 0x30, 0x16, 0x02, 0x2b, 0x8c, - 0x36, 0x88, 0x62, 0x31, 0xf4, 0x02, 0x3a, 0x02, 0x8c, 0x42, 0x59, 0xff, 0xda, 0xca, 0x04, 0x9a, - 0xfb, 0x46, 0xdf, 0x6b, 0xe8, 0x1b, 0x44, 0x0a, 0x9d, 0xe8, 0xda, 0x3a, 0x0d, 0xac, 0xb9, 0xde, - 0x0f, 0xa1, 0xa7, 0x61, 0x29, 0xd4, 0x6e, 0x4a, 0x60, 0x3a, 0x12, 0x18, 0x23, 0xe8, 0xfe, 0xdd, - 0x81, 0x7e, 0x9e, 0x0d, 0x1e, 0x61, 0x69, 0x12, 0x33, 0x82, 0x1e, 0x40, 0x5f, 0x5f, 0x67, 0x46, - 0xbf, 0x22, 0x7e, 0x44, 0xa7, 0x94, 0xcb, 0x24, 0xa9, 0x79, 0x1b, 0x8a, 0x31, 0xa6, 0x5f, 0x91, - 0x67, 0x82, 0x8c, 0xb6, 0xa1, 0x1e, 0x11, 0x1c, 0x92, 0x4c, 0xe6, 0x4c, 0xd3, 0xd3, 0x5f, 0xe8, + // 1889 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x59, 0xcb, 0x6f, 0x23, 0x49, + 0x19, 0x9f, 0xb6, 0x1d, 0xc7, 0xfe, 0xfc, 0x88, 0x5d, 0xc9, 0x64, 0x3d, 0x5e, 0x66, 0xe2, 0xe9, + 0x45, 0xda, 0xec, 0xb0, 0x84, 0x65, 0x76, 0x25, 0x90, 0x00, 0xad, 0x66, 0x32, 0xd9, 0x25, 0x9a, + 0xc7, 0xce, 0xb4, 0x87, 0x41, 0x42, 0x42, 0x4d, 0xb9, 0xbb, 0x92, 0x94, 0xd2, 0xee, 0x6e, 0xba, + 0xca, 0x99, 0x78, 0x39, 0xc2, 0x0d, 0x89, 0x0b, 0x07, 0x4e, 0xdc, 0xf9, 0x1b, 0x38, 0x70, 0xe1, + 0xc8, 0x1f, 0xc0, 0x99, 0x7f, 0x81, 0x2b, 0x42, 0x5a, 0xd5, 0xab, 0xbb, 0xda, 0x76, 0x92, 0xc9, + 0x4a, 0x73, 0x98, 0x5b, 0xf5, 0xf7, 0xaa, 0xaf, 0x7e, 0x5f, 0x7d, 0x8f, 0xb2, 0xa1, 0x3d, 0xc5, + 0x8c, 0x93, 0x6c, 0x2f, 0xcd, 0x12, 0x9e, 0xa0, 0xa6, 0xfa, 0xf2, 0xd3, 0x89, 0xfb, 0xc7, 0x3a, + 0x34, 0x7f, 0x4e, 0x70, 0xc6, 0x27, 0x04, 0x73, 0xd4, 0x85, 0x0a, 0x4d, 0x07, 0xce, 0xc8, 0xd9, + 0x6d, 0x7a, 0x15, 0x9a, 0x22, 0x04, 0xb5, 0x34, 0xc9, 0xf8, 0xa0, 0x32, 0x72, 0x76, 0x3b, 0x9e, + 0x5c, 0xa3, 0xdb, 0x00, 0xe9, 0x6c, 0x12, 0xd1, 0xc0, 0x9f, 0x65, 0xd1, 0xa0, 0x2a, 0x65, 0x9b, + 0x8a, 0xf2, 0x8b, 0x2c, 0x42, 0xbb, 0xd0, 0x9b, 0xe2, 0x73, 0xff, 0x2c, 0x89, 0x66, 0x53, 0xe2, + 0x07, 0xc9, 0x2c, 0xe6, 0x83, 0x9a, 0x54, 0xef, 0x4e, 0xf1, 0xf9, 0x2b, 0x49, 0xde, 0x17, 0x54, + 0x34, 0x12, 0x5e, 0x9d, 0xfb, 0x47, 0x34, 0x22, 0xfe, 0x29, 0x99, 0x0f, 0xd6, 0x46, 0xce, 0x6e, + 0xcd, 0x83, 0x29, 0x3e, 0xff, 0x82, 0x46, 0xe4, 0x31, 0x99, 0xa3, 0x1d, 0x68, 0x85, 0x98, 0x63, + 0x3f, 0x20, 0x31, 0x27, 0xd9, 0xa0, 0x2e, 0xf7, 0x02, 0x41, 0xda, 0x97, 0x14, 0xe1, 0x5f, 0x86, + 0x83, 0xd3, 0xc1, 0xba, 0xe4, 0xc8, 0xb5, 0xf0, 0x0f, 0x87, 0x53, 0x1a, 0xfb, 0xd2, 0xf3, 0x86, + 0xdc, 0xba, 0x29, 0x29, 0xcf, 0x85, 0xfb, 0x3f, 0x83, 0x75, 0xe5, 0x1b, 0x1b, 0x34, 0x47, 0xd5, + 0xdd, 0xd6, 0xfd, 0x0f, 0xf6, 0x72, 0x34, 0xf6, 0x94, 0x7b, 0x87, 0xf1, 0x51, 0x92, 0x4d, 0x31, + 0xa7, 0x49, 0xfc, 0x94, 0x30, 0x86, 0x8f, 0x89, 0x67, 0x74, 0xd0, 0x21, 0xb4, 0x62, 0xf2, 0xda, + 0x37, 0x26, 0x40, 0x9a, 0xd8, 0x5d, 0x32, 0x31, 0x3e, 0x49, 0x32, 0xbe, 0xc2, 0x0e, 0xc4, 0xe4, + 0xf5, 0x2b, 0x6d, 0xea, 0x05, 0x6c, 0x84, 0x24, 0x22, 0x9c, 0x84, 0xb9, 0xb9, 0xd6, 0x35, 0xcd, + 0x75, 0xb5, 0x01, 0x63, 0xf2, 0xbb, 0xd0, 0x3d, 0xc1, 0xcc, 0x8f, 0x93, 0xdc, 0x62, 0x7b, 0xe4, + 0xec, 0x36, 0xbc, 0xf6, 0x09, 0x66, 0xcf, 0x12, 0x23, 0xf5, 0x25, 0x34, 0x49, 0xe0, 0xb3, 0x13, + 0x9c, 0x85, 0x6c, 0xd0, 0x93, 0x5b, 0xde, 0x5b, 0xda, 0xf2, 0x20, 0x18, 0x0b, 0x81, 0x15, 0x9b, + 0x36, 0x88, 0x62, 0x31, 0xf4, 0x0c, 0x3a, 0x02, 0x8c, 0xc2, 0x58, 0xff, 0xda, 0xc6, 0x04, 0x9a, + 0x07, 0xc6, 0xde, 0x2b, 0xe8, 0x1b, 0x44, 0x0a, 0x9b, 0xe8, 0xda, 0x36, 0x0d, 0xac, 0xb9, 0xdd, + 0x0f, 0xa1, 0xa7, 0x61, 0x29, 0xcc, 0x6e, 0x4a, 0x60, 0x3a, 0x12, 0x18, 0x23, 0xe8, 0xfe, 0xdd, + 0x81, 0x7e, 0x9e, 0x0d, 0x1e, 0x61, 0x69, 0x12, 0x33, 0x82, 0xee, 0x41, 0x5f, 0x5f, 0x67, 0x46, + 0xbf, 0x26, 0x7e, 0x44, 0xa7, 0x94, 0xcb, 0x24, 0xa9, 0x79, 0x1b, 0x8a, 0x31, 0xa6, 0x5f, 0x93, + 0x27, 0x82, 0x8c, 0xb6, 0xa1, 0x1e, 0x11, 0x1c, 0x92, 0x4c, 0xe6, 0x4c, 0xd3, 0xd3, 0x5f, 0xe8, 0x43, 0xd8, 0x98, 0x12, 0x9e, 0xd1, 0x80, 0xf9, 0x38, 0x0c, 0x33, 0xc2, 0x98, 0x4e, 0x9d, 0xae, - 0x26, 0x3f, 0x52, 0x54, 0xf4, 0x63, 0x18, 0x18, 0x41, 0x2a, 0xee, 0xf8, 0x19, 0x8e, 0x7c, 0x46, - 0x82, 0x24, 0x0e, 0x99, 0xce, 0xa3, 0x6d, 0xcd, 0x3f, 0xd0, 0xec, 0xb1, 0xe2, 0xba, 0x7f, 0xad, + 0x26, 0x3f, 0x50, 0x54, 0xf4, 0x63, 0x18, 0x18, 0x41, 0x2a, 0xee, 0xf8, 0x19, 0x8e, 0x7c, 0x46, + 0x82, 0x24, 0x0e, 0x99, 0xce, 0xa3, 0x6d, 0xcd, 0x3f, 0xd4, 0xec, 0xb1, 0xe2, 0xba, 0x7f, 0xad, 0xc2, 0xe0, 0xa2, 0x0b, 0x2c, 0x33, 0x3b, 0x94, 0x4e, 0x77, 0xbc, 0x0a, 0x0d, 0x45, 0xe6, 0x88, - 0xc3, 0x48, 0x2f, 0x6b, 0x9e, 0x5c, 0xa3, 0x3b, 0x00, 0x41, 0x12, 0x45, 0x24, 0x10, 0x1b, 0xb5, - 0x7b, 0x16, 0x45, 0x64, 0x96, 0x4c, 0xd6, 0x22, 0xa9, 0x6b, 0x5e, 0x53, 0x50, 0x54, 0x3e, 0xdf, - 0x83, 0xb6, 0x02, 0x5e, 0x0b, 0xa8, 0x7c, 0x6e, 0x29, 0x9a, 0x12, 0xf9, 0x08, 0x90, 0x09, 0xf0, - 0x64, 0x9e, 0x0b, 0xd6, 0xa5, 0x60, 0x4f, 0x73, 0x1e, 0xcf, 0x8d, 0xf4, 0xfb, 0xd0, 0xcc, 0x08, - 0x0e, 0xfd, 0x24, 0x8e, 0xe6, 0x32, 0xc5, 0x1b, 0x5e, 0x43, 0x10, 0xbe, 0x8c, 0xa3, 0x39, 0xfa, - 0x1e, 0xf4, 0x33, 0x92, 0x46, 0x34, 0xc0, 0x7e, 0x1a, 0xe1, 0x80, 0x4c, 0x49, 0x6c, 0xb2, 0xbd, - 0xa7, 0x19, 0x87, 0x86, 0x8e, 0x06, 0xb0, 0x7e, 0x46, 0x32, 0x26, 0x8e, 0xd5, 0x94, 0x22, 0xe6, - 0x13, 0xf5, 0xa0, 0xca, 0x79, 0x34, 0x00, 0x49, 0x15, 0x4b, 0x74, 0x1f, 0x7a, 0x41, 0x32, 0x4d, - 0x71, 0xc0, 0xfd, 0x8c, 0x9c, 0x51, 0xb9, 0xa9, 0x25, 0xd9, 0x1b, 0x9a, 0xee, 0x69, 0xb2, 0x38, + 0xc3, 0x48, 0x2f, 0x6b, 0x9e, 0x5c, 0xa3, 0x3b, 0x00, 0x41, 0x12, 0x45, 0x24, 0x10, 0x8a, 0xda, + 0x3d, 0x8b, 0x22, 0x32, 0x4b, 0x26, 0x6b, 0x91, 0xd4, 0x35, 0xaf, 0x29, 0x28, 0x2a, 0x9f, 0xef, + 0x42, 0x5b, 0x01, 0xaf, 0x05, 0x54, 0x3e, 0xb7, 0x14, 0x4d, 0x89, 0x7c, 0x0c, 0xc8, 0x04, 0x78, + 0x32, 0xcf, 0x05, 0xeb, 0x52, 0xb0, 0xa7, 0x39, 0x0f, 0xe7, 0x46, 0xfa, 0x7d, 0x68, 0x66, 0x04, + 0x87, 0x7e, 0x12, 0x47, 0x73, 0x99, 0xe2, 0x0d, 0xaf, 0x21, 0x08, 0x5f, 0xc5, 0xd1, 0x1c, 0x7d, + 0x0f, 0xfa, 0x19, 0x49, 0x23, 0x1a, 0x60, 0x3f, 0x8d, 0x70, 0x40, 0xa6, 0x24, 0x36, 0xd9, 0xde, + 0xd3, 0x8c, 0xe7, 0x86, 0x8e, 0x06, 0xb0, 0x7e, 0x46, 0x32, 0x26, 0x8e, 0xd5, 0x94, 0x22, 0xe6, + 0x13, 0xf5, 0xa0, 0xca, 0x79, 0x34, 0x00, 0x49, 0x15, 0x4b, 0xf4, 0x11, 0xf4, 0x82, 0x64, 0x9a, + 0xe2, 0x80, 0xfb, 0x19, 0x39, 0xa3, 0x52, 0xa9, 0x25, 0xd9, 0x1b, 0x9a, 0xee, 0x69, 0xb2, 0x38, 0xce, 0x34, 0x09, 0xe9, 0x11, 0x25, 0xa1, 0x8f, 0xb9, 0x0e, 0x93, 0x4c, 0xb9, 0xaa, 0xd7, 0x33, - 0x9c, 0x47, 0x5c, 0x05, 0xc8, 0xfd, 0x9b, 0x03, 0xb7, 0x2f, 0x4d, 0xe7, 0xa5, 0x20, 0x5d, 0x15, - 0x90, 0x6f, 0x0b, 0x03, 0x77, 0x06, 0x77, 0xaf, 0x48, 0xb2, 0x2b, 0x7c, 0xad, 0x2c, 0xf9, 0xea, - 0x42, 0x87, 0x04, 0x3e, 0x8d, 0x43, 0x72, 0xee, 0x4f, 0x28, 0x57, 0xd7, 0xbf, 0xe3, 0xb5, 0x48, - 0x70, 0x20, 0x68, 0x8f, 0x29, 0x67, 0xee, 0x3a, 0xac, 0xed, 0x4f, 0x53, 0x3e, 0x77, 0xff, 0xe1, - 0xc0, 0xc6, 0x78, 0x96, 0x92, 0xec, 0x71, 0x94, 0x04, 0xa7, 0xfb, 0xe7, 0x3c, 0xc3, 0xe8, 0x4b, - 0xe8, 0x92, 0x0c, 0xb3, 0x59, 0x26, 0xae, 0x4d, 0x48, 0xe3, 0x63, 0x69, 0xbc, 0x5c, 0x2d, 0x17, - 0xf6, 0xec, 0xee, 0xab, 0x0d, 0x7b, 0x52, 0xde, 0xeb, 0x10, 0xfb, 0x73, 0xf8, 0x2b, 0xe8, 0x94, - 0xf8, 0x22, 0x27, 0x44, 0x6f, 0xd1, 0x87, 0x92, 0x6b, 0x91, 0xcf, 0x29, 0xce, 0x28, 0x9f, 0xeb, - 0x1e, 0xa8, 0xbf, 0x44, 0x2e, 0xe8, 0x9a, 0x40, 0x43, 0x71, 0x96, 0xaa, 0xe8, 0x32, 0x8a, 0x72, - 0x10, 0x32, 0xf7, 0x3e, 0x6c, 0xee, 0x45, 0x94, 0xc4, 0xfc, 0x19, 0x65, 0x9c, 0xc4, 0x1e, 0xf9, - 0xed, 0x8c, 0x30, 0x2e, 0x2c, 0xc4, 0x78, 0x4a, 0x74, 0x87, 0x95, 0x6b, 0xf7, 0xf7, 0xd0, 0x55, - 0x58, 0x3f, 0x4b, 0x02, 0x89, 0xb0, 0x88, 0x87, 0x68, 0xad, 0x4a, 0x48, 0x2c, 0x17, 0x7a, 0x6e, - 0x65, 0xb1, 0xe7, 0xde, 0x82, 0x86, 0x6c, 0x4a, 0x85, 0x2b, 0xeb, 0xa2, 0xcf, 0xd0, 0x90, 0x15, - 0x49, 0x19, 0x2a, 0x76, 0x4d, 0xb2, 0x5b, 0xa6, 0x6f, 0xd0, 0x90, 0xb9, 0xaf, 0x60, 0xf3, 0x59, - 0x92, 0x9c, 0xce, 0x52, 0xe5, 0x86, 0xf1, 0xb5, 0x7c, 0x42, 0x67, 0x54, 0x15, 0x36, 0xf3, 0x13, - 0x5e, 0x15, 0x6f, 0xf7, 0xbf, 0x0e, 0x6c, 0x95, 0xd5, 0xea, 0x6a, 0xfa, 0x1b, 0xd8, 0xcc, 0xf5, - 0xfa, 0x91, 0x3e, 0xb3, 0x32, 0xd0, 0x7a, 0xf8, 0xb1, 0x15, 0xcc, 0x55, 0xbb, 0x4d, 0x87, 0x0e, - 0x0d, 0x58, 0x5e, 0xff, 0x6c, 0x81, 0xc2, 0x86, 0xe7, 0xd0, 0x5b, 0x14, 0x13, 0xb5, 0x24, 0xb7, - 0xaa, 0x91, 0x6d, 0x98, 0x9d, 0xe8, 0x87, 0xd0, 0x2c, 0x1c, 0xa9, 0x48, 0x47, 0x36, 0x4b, 0x8e, - 0x68, 0x5b, 0x85, 0x14, 0xda, 0x82, 0x35, 0x92, 0x65, 0x49, 0xa6, 0xb3, 0x52, 0x7d, 0xb8, 0x3f, - 0x81, 0xc6, 0x37, 0x8e, 0xa2, 0xfb, 0x2f, 0x07, 0x3a, 0x8f, 0x18, 0xa3, 0xc7, 0xf9, 0x75, 0xd9, - 0x82, 0x35, 0x55, 0x21, 0x55, 0xb3, 0x51, 0x1f, 0x68, 0x04, 0x2d, 0x9d, 0xdc, 0x16, 0xf4, 0x36, - 0xe9, 0xca, 0xba, 0xa1, 0x13, 0xbe, 0xa6, 0x5c, 0x13, 0x45, 0x6f, 0x61, 0xd2, 0x5a, 0xbb, 0x70, - 0xd2, 0xaa, 0x5b, 0x93, 0xd6, 0xfb, 0xd0, 0x94, 0x9b, 0xe2, 0x24, 0x24, 0x7a, 0x04, 0x6b, 0x08, - 0xc2, 0x8b, 0x24, 0x24, 0xee, 0x5f, 0x1c, 0xe8, 0x9a, 0xd3, 0xe8, 0xc8, 0xf7, 0xa0, 0x7a, 0x94, - 0xa3, 0x2f, 0x96, 0x06, 0xa3, 0xca, 0x45, 0x18, 0x2d, 0x4d, 0x97, 0x39, 0x22, 0x35, 0x1b, 0x91, - 0x3c, 0x18, 0x6b, 0x56, 0x30, 0x84, 0xcb, 0x78, 0xc6, 0x4f, 0x8c, 0xcb, 0x62, 0xed, 0x1e, 0x43, - 0x7f, 0xcc, 0x31, 0xa7, 0x8c, 0xd3, 0x80, 0x19, 0x98, 0x17, 0x00, 0x75, 0xae, 0x02, 0xb4, 0x72, - 0x11, 0xa0, 0xd5, 0x1c, 0x50, 0xf7, 0x9f, 0x0e, 0x20, 0xdb, 0x92, 0x86, 0xe0, 0x5b, 0x30, 0x25, - 0x20, 0xe3, 0x09, 0x17, 0x63, 0x82, 0x68, 0xe8, 0xba, 0x2d, 0x4b, 0x8a, 0x18, 0x4b, 0x44, 0x94, - 0x66, 0x8c, 0x84, 0x8a, 0xab, 0x7a, 0x72, 0x43, 0x10, 0x24, 0xb3, 0xdc, 0xd2, 0xeb, 0x0b, 0x2d, - 0xdd, 0x7d, 0x04, 0xad, 0x31, 0x4f, 0x32, 0x7c, 0x4c, 0x5e, 0xcd, 0xd3, 0xb7, 0xf1, 0x5e, 0x7b, - 0x57, 0x29, 0x80, 0x18, 0x01, 0xec, 0x15, 0xde, 0xaf, 0x2a, 0x80, 0xbf, 0x83, 0x9b, 0x85, 0x84, - 0xa8, 0x97, 0x26, 0x2e, 0x9f, 0xc2, 0x36, 0x8d, 0x83, 0x68, 0x16, 0x12, 0x3f, 0x16, 0xed, 0x27, - 0xca, 0xa7, 0x5a, 0x47, 0x0e, 0x03, 0x5b, 0x9a, 0xfb, 0x42, 0x32, 0xcd, 0x74, 0xfb, 0x11, 0x20, - 0xb3, 0x8b, 0x04, 0xf9, 0x8e, 0x8a, 0xdc, 0xd1, 0xd3, 0x9c, 0xfd, 0x40, 0x4b, 0xbb, 0x2f, 0x61, - 0x7b, 0xd1, 0xb8, 0x0e, 0xd5, 0x8f, 0xa0, 0x55, 0xc0, 0x6e, 0xea, 0xd3, 0x4d, 0xab, 0x2c, 0x14, - 0xfb, 0x3c, 0x5b, 0xd2, 0xfd, 0x3e, 0xbc, 0x57, 0xb0, 0x9e, 0xc8, 0x42, 0x7b, 0x59, 0xfd, 0x1f, - 0xc2, 0x60, 0x59, 0x5c, 0xf9, 0xe0, 0xfe, 0xa7, 0x02, 0xed, 0x27, 0x3a, 0xa3, 0x44, 0x0f, 0xb6, - 0xba, 0x6e, 0x53, 0x76, 0xdd, 0x7b, 0xd0, 0x2e, 0xbd, 0xb4, 0xd4, 0x38, 0xd7, 0x3a, 0xb3, 0x9e, - 0x59, 0xab, 0x1e, 0x64, 0x55, 0x29, 0xb6, 0xf8, 0x20, 0x7b, 0x00, 0xfd, 0xa3, 0x8c, 0x90, 0xe5, - 0xb7, 0x5b, 0xcd, 0xdb, 0x10, 0x0c, 0x5b, 0x76, 0x17, 0x36, 0x71, 0xc0, 0xe9, 0xd9, 0x82, 0xb4, - 0xba, 0x5f, 0x7d, 0xc5, 0xb2, 0xe5, 0x3f, 0xcf, 0x1d, 0xa5, 0xf1, 0x51, 0xc2, 0x06, 0xf5, 0xb7, - 0x7f, 0x7b, 0xe9, 0xd3, 0x08, 0x0e, 0x43, 0x87, 0xd0, 0x35, 0x33, 0xbc, 0xd6, 0xb4, 0x7e, 0xed, - 0xf7, 0x41, 0x9b, 0x14, 0x2c, 0xe6, 0xfe, 0xb1, 0x02, 0x0d, 0x0f, 0x07, 0xa7, 0xef, 0x36, 0xbe, - 0x9f, 0xc1, 0x46, 0x5e, 0x8b, 0x4b, 0x10, 0xbf, 0x67, 0x01, 0x63, 0x5f, 0x25, 0xaf, 0x13, 0x5a, - 0x5f, 0xcc, 0xfd, 0xbf, 0x03, 0xdd, 0x27, 0x79, 0xbd, 0x7f, 0xb7, 0xc1, 0x78, 0x08, 0x20, 0x1a, - 0x54, 0x09, 0x07, 0xbb, 0xa1, 0x9b, 0x70, 0x7b, 0xcd, 0x4c, 0xaf, 0x98, 0xfb, 0xe7, 0x0a, 0xb4, - 0x5f, 0x25, 0x69, 0x12, 0x25, 0xc7, 0xf3, 0x77, 0xfb, 0xf4, 0xfb, 0xd0, 0xb7, 0x7a, 0x79, 0x09, - 0x84, 0x5b, 0x0b, 0x97, 0xa1, 0x08, 0xb6, 0xb7, 0x11, 0x96, 0xbe, 0x99, 0xbb, 0x09, 0x7d, 0x3d, - 0x97, 0x16, 0x25, 0xd9, 0xfd, 0x83, 0x03, 0xc8, 0xa6, 0xea, 0x5a, 0xf9, 0x53, 0xe8, 0x70, 0x8d, - 0x9d, 0xb4, 0xa7, 0x47, 0x73, 0xfb, 0xee, 0xd9, 0xd8, 0x7a, 0x6d, 0x6e, 0x23, 0xfd, 0x03, 0xd8, - 0x5a, 0x7a, 0x5f, 0xfb, 0xd3, 0x89, 0x46, 0xb8, 0xbf, 0xf0, 0xc4, 0x7e, 0x3e, 0x71, 0x3f, 0x85, - 0x9b, 0x6a, 0x38, 0x34, 0x75, 0xdc, 0xd4, 0xd7, 0xa5, 0x29, 0xaf, 0x53, 0x4c, 0x79, 0xee, 0xff, - 0x1c, 0xd8, 0x5e, 0xdc, 0xa6, 0xfd, 0xbf, 0x6c, 0x1f, 0xc2, 0x80, 0x74, 0xbd, 0xb1, 0xe7, 0x55, - 0x35, 0x26, 0x7e, 0xb2, 0x34, 0xaf, 0x2e, 0xea, 0xde, 0x35, 0x75, 0xa8, 0x18, 0x59, 0x7b, 0xac, - 0x4c, 0x60, 0x43, 0x0c, 0xfd, 0x25, 0x31, 0x31, 0xd5, 0x1b, 0xbb, 0xda, 0xa7, 0x75, 0xbd, 0xf1, - 0x1b, 0x0c, 0xac, 0xee, 0x5d, 0xb8, 0xfd, 0x05, 0xe1, 0xcf, 0xa5, 0xcc, 0x5e, 0x12, 0x1f, 0xd1, - 0xe3, 0x59, 0xa6, 0x84, 0x8a, 0xd0, 0xde, 0xb9, 0x48, 0x42, 0xc3, 0xb4, 0xe2, 0x27, 0x86, 0x73, - 0xed, 0x9f, 0x18, 0x95, 0xcb, 0x7e, 0x62, 0x3c, 0xfc, 0x77, 0x1d, 0xd6, 0xc7, 0x04, 0xbf, 0x21, - 0x24, 0x44, 0x07, 0xd0, 0x19, 0x93, 0x38, 0x2c, 0x7e, 0x4f, 0x6e, 0x59, 0x67, 0xcc, 0xa9, 0xc3, - 0xef, 0xac, 0xa2, 0xe6, 0x2d, 0xf4, 0xc6, 0x8e, 0xf3, 0xb1, 0x83, 0x0e, 0xa1, 0xf3, 0x94, 0x90, - 0x74, 0x2f, 0x89, 0x63, 0x12, 0x70, 0x12, 0xa2, 0x3b, 0x76, 0x23, 0x5f, 0x7e, 0xa9, 0x0d, 0x6f, - 0x2d, 0xf5, 0x13, 0x03, 0xaa, 0xd6, 0xf8, 0x12, 0xda, 0xf6, 0x03, 0xa5, 0xa4, 0x70, 0xc5, 0x73, - 0x6a, 0x78, 0xf7, 0x8a, 0x97, 0x8d, 0x7b, 0x03, 0x7d, 0x06, 0x75, 0x35, 0x31, 0xa3, 0x81, 0x25, - 0x5c, 0x7a, 0x12, 0x94, 0xfc, 0x2a, 0x8f, 0xd7, 0xee, 0x0d, 0xf4, 0x14, 0xa0, 0x98, 0x39, 0x91, - 0x8d, 0xcb, 0xd2, 0xd0, 0x3b, 0xbc, 0x7d, 0x01, 0x37, 0x57, 0xf6, 0x4b, 0xe8, 0x96, 0x27, 0x23, - 0x34, 0x5a, 0x39, 0xfc, 0x58, 0xe5, 0x61, 0x78, 0xef, 0x12, 0x89, 0x5c, 0xf1, 0xaf, 0xa1, 0xb7, - 0x38, 0xf0, 0x20, 0x77, 0xe5, 0xc6, 0xd2, 0xf0, 0x34, 0xfc, 0xe0, 0x52, 0x19, 0x1b, 0x84, 0xa2, - 0x42, 0x95, 0x40, 0x58, 0x2a, 0x67, 0x25, 0x10, 0x96, 0xcb, 0x9a, 0x02, 0xa1, 0x9c, 0xd6, 0x25, - 0x10, 0x56, 0x16, 0xa1, 0x12, 0x08, 0xab, 0x6b, 0x82, 0x7b, 0x03, 0x25, 0xb0, 0xbd, 0x3a, 0xd9, - 0x90, 0xfd, 0x3f, 0xe3, 0xd2, 0x8c, 0x1d, 0xde, 0x7f, 0x0b, 0x49, 0x63, 0x70, 0x52, 0x97, 0xbf, - 0xfe, 0x3f, 0xf9, 0x3a, 0x00, 0x00, 0xff, 0xff, 0x28, 0x1f, 0x4c, 0x0e, 0x0a, 0x18, 0x00, 0x00, + 0x9c, 0x07, 0x5c, 0x05, 0xc8, 0xfd, 0x9b, 0x03, 0xb7, 0x2f, 0x4d, 0xe7, 0xa5, 0x20, 0x5d, 0x15, + 0x90, 0xb7, 0x85, 0x81, 0x3b, 0x83, 0x9d, 0x2b, 0x92, 0xec, 0x0a, 0x5f, 0x2b, 0x4b, 0xbe, 0xba, + 0xd0, 0x21, 0x81, 0x4f, 0xe3, 0x90, 0x9c, 0xfb, 0x13, 0xca, 0xd5, 0xf5, 0xef, 0x78, 0x2d, 0x12, + 0x1c, 0x0a, 0xda, 0x43, 0xca, 0x99, 0xbb, 0x0e, 0x6b, 0x07, 0xd3, 0x94, 0xcf, 0xdd, 0x7f, 0x38, + 0xb0, 0x31, 0x9e, 0xa5, 0x24, 0x7b, 0x18, 0x25, 0xc1, 0xe9, 0xc1, 0x39, 0xcf, 0x30, 0xfa, 0x0a, + 0xba, 0x24, 0xc3, 0x6c, 0x96, 0x89, 0x6b, 0x13, 0xd2, 0xf8, 0x58, 0x6e, 0x5e, 0xae, 0x96, 0x0b, + 0x3a, 0x7b, 0x07, 0x4a, 0x61, 0x5f, 0xca, 0x7b, 0x1d, 0x62, 0x7f, 0x0e, 0x7f, 0x05, 0x9d, 0x12, + 0x5f, 0xe4, 0x84, 0xe8, 0x2d, 0xfa, 0x50, 0x72, 0x2d, 0xf2, 0x39, 0xc5, 0x19, 0xe5, 0x73, 0xdd, + 0x03, 0xf5, 0x97, 0xc8, 0x05, 0x5d, 0x13, 0x68, 0x28, 0xce, 0x52, 0x15, 0x5d, 0x46, 0x51, 0x0e, + 0x43, 0xe6, 0xde, 0x83, 0xad, 0xc7, 0x84, 0xa4, 0xfb, 0x49, 0x1c, 0x93, 0x80, 0x93, 0xd0, 0x23, + 0xbf, 0x9d, 0x11, 0xc6, 0xc5, 0x16, 0x31, 0x9e, 0x12, 0xdd, 0x62, 0xe5, 0xda, 0xfd, 0x8b, 0x03, + 0x5d, 0x85, 0xf6, 0x93, 0x24, 0x90, 0x18, 0x8b, 0x88, 0x88, 0xe6, 0xaa, 0xa4, 0xc4, 0x72, 0xa1, + 0xeb, 0x56, 0x16, 0xbb, 0xee, 0x2d, 0x68, 0xc8, 0xb6, 0x54, 0x38, 0xb3, 0x2e, 0x3a, 0x0d, 0x0d, + 0x59, 0x91, 0x96, 0xa1, 0x62, 0xd7, 0x24, 0xbb, 0x65, 0x3a, 0x87, 0x10, 0x29, 0x8a, 0xd6, 0x9a, + 0x5d, 0xb4, 0xdc, 0x97, 0xb0, 0xf9, 0x24, 0x49, 0x4e, 0x67, 0xa9, 0x72, 0xcf, 0x1c, 0xa2, 0x7c, + 0x76, 0x67, 0x54, 0x15, 0xbe, 0xe4, 0x67, 0xbf, 0xea, 0x26, 0xb8, 0xff, 0x75, 0x60, 0xab, 0x6c, + 0x56, 0xd7, 0xd9, 0xdf, 0xc0, 0x66, 0x6e, 0xd7, 0x8f, 0x34, 0x16, 0x6a, 0x83, 0xd6, 0xfd, 0x4f, + 0xac, 0x30, 0xaf, 0xd2, 0x36, 0xbd, 0x3b, 0x34, 0x20, 0x7a, 0xfd, 0xb3, 0x05, 0x0a, 0x1b, 0x9e, + 0x43, 0x6f, 0x51, 0x4c, 0x54, 0x99, 0x7c, 0x57, 0x8d, 0x78, 0xc3, 0x68, 0xa2, 0x1f, 0x42, 0xb3, + 0x70, 0xa4, 0x22, 0x1d, 0xd9, 0x2c, 0x39, 0xa2, 0xf7, 0x2a, 0xa4, 0xd0, 0x16, 0xac, 0x91, 0x2c, + 0x4b, 0x32, 0x9d, 0xaf, 0xea, 0xc3, 0xfd, 0x09, 0x34, 0xbe, 0x75, 0x74, 0xdd, 0x7f, 0x39, 0xd0, + 0x79, 0xc0, 0x18, 0x3d, 0x8e, 0x4d, 0x08, 0xb6, 0x60, 0x4d, 0xd5, 0x4e, 0xd5, 0x86, 0xd4, 0x07, + 0x1a, 0x41, 0x4b, 0xa7, 0xbd, 0x05, 0xbd, 0x4d, 0xba, 0xb2, 0xa2, 0xe8, 0x52, 0x50, 0x53, 0xae, + 0x89, 0x72, 0xb8, 0x30, 0x83, 0xad, 0x5d, 0x38, 0x83, 0xd5, 0xad, 0x19, 0xec, 0x7d, 0x68, 0x4a, + 0xa5, 0x38, 0x09, 0x89, 0x1e, 0xce, 0x1a, 0x82, 0xf0, 0x2c, 0x09, 0x89, 0xfb, 0x67, 0x07, 0xba, + 0xe6, 0x34, 0x3a, 0xf2, 0x3d, 0xa8, 0x1e, 0xe5, 0xe8, 0x8b, 0xa5, 0xc1, 0xa8, 0x72, 0x11, 0x46, + 0x4b, 0x73, 0x67, 0x8e, 0x48, 0xcd, 0x46, 0x24, 0x0f, 0xc6, 0x9a, 0x15, 0x0c, 0xe1, 0x32, 0x9e, + 0xf1, 0x13, 0xe3, 0xb2, 0x58, 0xbb, 0xc7, 0xd0, 0x1f, 0x73, 0xcc, 0x29, 0xe3, 0x34, 0x60, 0x06, + 0xe6, 0x05, 0x40, 0x9d, 0xab, 0x00, 0xad, 0x5c, 0x04, 0x68, 0x35, 0x07, 0xd4, 0xfd, 0xa7, 0x03, + 0xc8, 0xde, 0x49, 0x43, 0xf0, 0x16, 0xb6, 0x12, 0x90, 0xf1, 0x84, 0x8b, 0x01, 0x42, 0xb4, 0x7a, + 0xdd, 0xb0, 0x25, 0x45, 0x0c, 0x2c, 0x22, 0x4a, 0x33, 0x46, 0x42, 0xc5, 0x55, 0xdd, 0xba, 0x21, + 0x08, 0x92, 0x59, 0x6e, 0xf6, 0xf5, 0x85, 0x66, 0xef, 0x3e, 0x80, 0xd6, 0x98, 0x27, 0x19, 0x3e, + 0x26, 0x2f, 0xe7, 0xe9, 0x9b, 0x78, 0xaf, 0xbd, 0xab, 0x14, 0x40, 0x8c, 0x00, 0xf6, 0x0b, 0xef, + 0x57, 0x55, 0xc6, 0xdf, 0xc1, 0xcd, 0x42, 0xe2, 0x09, 0x65, 0xdc, 0xc4, 0xe5, 0x33, 0xd8, 0xa6, + 0x71, 0x10, 0xcd, 0x42, 0xe2, 0xc7, 0xa2, 0x31, 0x45, 0xf9, 0xbc, 0xeb, 0xc8, 0x31, 0x61, 0x4b, + 0x73, 0x9f, 0x49, 0xa6, 0x99, 0x7b, 0x3f, 0x06, 0x64, 0xb4, 0x48, 0x90, 0x6b, 0x54, 0xa4, 0x46, + 0x4f, 0x73, 0x0e, 0x02, 0x2d, 0xed, 0xbe, 0x80, 0xed, 0xc5, 0xcd, 0x75, 0xa8, 0x7e, 0x04, 0xad, + 0x02, 0x76, 0x53, 0x9f, 0x6e, 0x5a, 0x65, 0xa1, 0xd0, 0xf3, 0x6c, 0x49, 0xf7, 0xfb, 0xf0, 0x5e, + 0xc1, 0x7a, 0x24, 0x0b, 0xf0, 0x65, 0x8d, 0x61, 0x08, 0x83, 0x65, 0x71, 0xe5, 0x83, 0xfb, 0x9f, + 0x0a, 0xb4, 0x1f, 0xe9, 0x8c, 0x12, 0xdd, 0xd9, 0xea, 0xc7, 0x4d, 0xd9, 0x8f, 0xef, 0x42, 0xbb, + 0xf4, 0x06, 0x53, 0x83, 0x5e, 0xeb, 0xcc, 0x7a, 0x80, 0xad, 0x7a, 0xaa, 0x55, 0xa5, 0xd8, 0xe2, + 0x53, 0xed, 0x1e, 0xf4, 0x8f, 0x32, 0x42, 0x96, 0x5f, 0x75, 0x35, 0x6f, 0x43, 0x30, 0x6c, 0xd9, + 0x3d, 0xd8, 0xc4, 0x01, 0xa7, 0x67, 0x0b, 0xd2, 0xea, 0x7e, 0xf5, 0x15, 0xcb, 0x96, 0xff, 0x22, + 0x77, 0x94, 0xc6, 0x47, 0x09, 0x1b, 0xd4, 0xdf, 0xfc, 0x55, 0xa6, 0x4f, 0x23, 0x38, 0x0c, 0x3d, + 0x87, 0xae, 0x99, 0xee, 0xb5, 0xa5, 0xf5, 0x6b, 0xbf, 0x1c, 0xda, 0xa4, 0x60, 0x31, 0xf7, 0x0f, + 0x15, 0x68, 0x78, 0x38, 0x38, 0x7d, 0xb7, 0xf1, 0xfd, 0x1c, 0x36, 0xf2, 0x5a, 0x5c, 0x82, 0xf8, + 0x3d, 0x0b, 0x18, 0xfb, 0x2a, 0x79, 0x9d, 0xd0, 0xfa, 0x62, 0xee, 0xff, 0x1d, 0xe8, 0x3e, 0xca, + 0xeb, 0xfd, 0xbb, 0x0d, 0xc6, 0x7d, 0x00, 0xd1, 0xa0, 0x4a, 0x38, 0xd8, 0x0d, 0xdd, 0x84, 0xdb, + 0x6b, 0x66, 0x7a, 0xc5, 0xdc, 0x3f, 0x55, 0xa0, 0xfd, 0x32, 0x49, 0x93, 0x28, 0x39, 0x9e, 0xbf, + 0xdb, 0xa7, 0x3f, 0x80, 0xbe, 0xd5, 0xcb, 0x4b, 0x20, 0xdc, 0x5a, 0xb8, 0x0c, 0x45, 0xb0, 0xbd, + 0x8d, 0xb0, 0xf4, 0xcd, 0xdc, 0x4d, 0xe8, 0xeb, 0x79, 0xb5, 0x28, 0xc9, 0xee, 0xef, 0x1d, 0x40, + 0x36, 0x55, 0xd7, 0xca, 0x9f, 0x42, 0x87, 0x6b, 0xec, 0xe4, 0x7e, 0x7a, 0x68, 0xb7, 0xef, 0x9e, + 0x8d, 0xad, 0xd7, 0xe6, 0x36, 0xd2, 0x3f, 0x80, 0xad, 0xa5, 0x97, 0xb7, 0x3f, 0x9d, 0x68, 0x84, + 0xfb, 0x0b, 0x8f, 0xef, 0xa7, 0x13, 0xf7, 0x33, 0xb8, 0xa9, 0x86, 0x43, 0x53, 0xc7, 0x4d, 0x7d, + 0x5d, 0x9a, 0xf2, 0x3a, 0xc5, 0x94, 0xe7, 0xfe, 0xcf, 0x81, 0xed, 0x45, 0x35, 0xed, 0xff, 0x65, + 0x7a, 0x08, 0x03, 0xd2, 0xf5, 0xc6, 0x9e, 0x57, 0xd5, 0x98, 0xf8, 0xe9, 0xd2, 0xbc, 0xba, 0x68, + 0x7b, 0xcf, 0xd4, 0xa1, 0x62, 0x64, 0xed, 0xb1, 0x32, 0x81, 0x0d, 0x31, 0xf4, 0x97, 0xc4, 0xc4, + 0xb4, 0x6f, 0xf6, 0xd5, 0x3e, 0xad, 0x6b, 0xc5, 0x6f, 0x31, 0xb0, 0xba, 0x3b, 0x70, 0xfb, 0x4b, + 0xc2, 0x9f, 0x4a, 0x99, 0xfd, 0x24, 0x3e, 0xa2, 0xc7, 0xb3, 0x4c, 0x09, 0x15, 0xa1, 0xbd, 0x73, + 0x91, 0x84, 0x86, 0x69, 0xc5, 0xcf, 0x1b, 0xce, 0xb5, 0x7f, 0xde, 0xa8, 0x5c, 0xf6, 0xf3, 0xc6, + 0xfd, 0x7f, 0xd7, 0x61, 0x7d, 0x4c, 0xf0, 0x6b, 0x42, 0x42, 0x74, 0x08, 0x9d, 0x31, 0x89, 0xc3, + 0xe2, 0x87, 0xcb, 0x2d, 0xeb, 0x8c, 0x39, 0x75, 0xf8, 0x9d, 0x55, 0xd4, 0xbc, 0x85, 0xde, 0xd8, + 0x75, 0x3e, 0x71, 0xd0, 0x0b, 0xe8, 0x94, 0x5e, 0x6a, 0x68, 0xc7, 0x52, 0x5a, 0xf5, 0x86, 0x1b, + 0xde, 0x5a, 0x6a, 0x28, 0x06, 0xd5, 0xdc, 0x64, 0xdb, 0x7e, 0xa1, 0xa0, 0x3b, 0x17, 0x3e, 0x5d, + 0x94, 0xc1, 0x9d, 0x2b, 0x9e, 0x36, 0xee, 0x0d, 0xf4, 0x39, 0xd4, 0xd5, 0xc8, 0x8c, 0x06, 0x96, + 0x70, 0xe9, 0x4d, 0x50, 0xf2, 0xab, 0x3c, 0x5f, 0xbb, 0x37, 0xd0, 0x63, 0x80, 0x62, 0xe8, 0x44, + 0x36, 0x30, 0x4b, 0x53, 0xef, 0xf0, 0xf6, 0x05, 0xdc, 0xdc, 0xd8, 0x2f, 0xa1, 0x5b, 0x1e, 0x8d, + 0xd0, 0x68, 0xe5, 0xf4, 0x63, 0xd5, 0x87, 0xe1, 0xdd, 0x4b, 0x24, 0x72, 0xc3, 0xbf, 0x86, 0xde, + 0xe2, 0xc4, 0x83, 0xdc, 0x95, 0x8a, 0xa5, 0xe9, 0x69, 0xf8, 0xc1, 0xa5, 0x32, 0x36, 0x08, 0x45, + 0x89, 0x2a, 0x81, 0xb0, 0x54, 0xcf, 0x4a, 0x20, 0x2c, 0xd7, 0x35, 0x05, 0x42, 0x39, 0xaf, 0x4b, + 0x20, 0xac, 0xac, 0x42, 0x25, 0x10, 0x56, 0x17, 0x05, 0xf7, 0x06, 0x4a, 0x60, 0x7b, 0x75, 0xb6, + 0x21, 0xfb, 0xa7, 0x8e, 0x4b, 0x53, 0x76, 0xf8, 0xd1, 0x1b, 0x48, 0x9a, 0x0d, 0x27, 0x75, 0xf9, + 0xaf, 0xc0, 0xa7, 0xdf, 0x04, 0x00, 0x00, 0xff, 0xff, 0xe6, 0xab, 0xab, 0x3b, 0x25, 0x18, 0x00, + 0x00, } diff --git a/weed/server/master_grpc_server.go b/weed/server/master_grpc_server.go index e0d1fd174..9e1b2e427 100644 --- a/weed/server/master_grpc_server.go +++ b/weed/server/master_grpc_server.go @@ -176,7 +176,7 @@ func (ms *MasterServer) KeepConnected(stream master_pb.Seaweed_KeepConnectedServ } if !ms.Topo.IsLeader() { - return raft.NotLeaderError + return ms.informNewLeader(stream) } // remember client address @@ -236,7 +236,7 @@ func (ms *MasterServer) KeepConnected(stream master_pb.Seaweed_KeepConnectedServ } case <-ticker.C: if !ms.Topo.IsLeader() { - return raft.NotLeaderError + return ms.informNewLeader(stream) } case <-stopChan: return nil @@ -245,3 +245,17 @@ func (ms *MasterServer) KeepConnected(stream master_pb.Seaweed_KeepConnectedServ return nil } + +func (ms *MasterServer) informNewLeader(stream master_pb.Seaweed_KeepConnectedServer) error { + leader, err := ms.Topo.Leader() + if err != nil { + glog.Error("topo leader: %v", err) + return raft.NotLeaderError + } + if err := stream.Send(&master_pb.VolumeLocation{ + Leader: leader, + }); err != nil { + return err + } + return nil +} diff --git a/weed/wdclient/masterclient.go b/weed/wdclient/masterclient.go index e16356e9d..8a7866bd7 100644 --- a/weed/wdclient/masterclient.go +++ b/weed/wdclient/masterclient.go @@ -51,54 +51,72 @@ func (mc *MasterClient) KeepConnectedToMaster() { } func (mc *MasterClient) tryAllMasters() { + nextHintedLeader := "" for _, master := range mc.masters { - glog.V(1).Infof("%s Connecting to master %v", mc.name, master) - gprcErr := withMasterClient(context.Background(), master, mc.grpcDialOption, func(ctx context.Context, client master_pb.SeaweedClient) error { - stream, err := client.KeepConnected(ctx) + nextHintedLeader = mc.tryConnectToMaster(master) + for nextHintedLeader != "" { + nextHintedLeader = mc.tryConnectToMaster(nextHintedLeader) + } + + mc.currentMaster = "" + } +} + +func (mc *MasterClient) tryConnectToMaster(master string) (nextHintedLeader string) { + glog.V(1).Infof("%s Connecting to master %v", mc.name, master) + gprcErr := withMasterClient(context.Background(), master, mc.grpcDialOption, func(ctx context.Context, client master_pb.SeaweedClient) error { + + stream, err := client.KeepConnected(ctx) + if err != nil { + glog.V(0).Infof("%s failed to keep connected to %s: %v", mc.name, master, err) + return err + } + + if err = stream.Send(&master_pb.KeepConnectedRequest{Name: mc.name}); err != nil { + glog.V(0).Infof("%s failed to send to %s: %v", mc.name, master, err) + return err + } + + if mc.currentMaster == "" { + glog.V(1).Infof("%s Connected to %v", mc.name, master) + mc.currentMaster = master + } + + for { + volumeLocation, err := stream.Recv() if err != nil { - glog.V(0).Infof("%s failed to keep connected to %s: %v", mc.name, master, err) + glog.V(0).Infof("%s failed to receive from %s: %v", mc.name, master, err) return err } - if err = stream.Send(&master_pb.ClientListenRequest{Name: mc.name}); err != nil { - glog.V(0).Infof("%s failed to send to %s: %v", mc.name, master, err) - return err + // maybe the leader is changed + if volumeLocation.Leader != "" { + glog.V(1).Infof("redirected to leader %v", volumeLocation.Leader) + nextHintedLeader = volumeLocation.Leader + return nil } - if mc.currentMaster == "" { - glog.V(1).Infof("%s Connected to %v", mc.name, master) - mc.currentMaster = master + // process new volume location + loc := Location{ + Url: volumeLocation.Url, + PublicUrl: volumeLocation.PublicUrl, } - - for { - if volumeLocation, err := stream.Recv(); err != nil { - glog.V(0).Infof("%s failed to receive from %s: %v", mc.name, master, err) - return err - } else { - loc := Location{ - Url: volumeLocation.Url, - PublicUrl: volumeLocation.PublicUrl, - } - for _, newVid := range volumeLocation.NewVids { - glog.V(1).Infof("%s: %s adds volume %d", mc.name, loc.Url, newVid) - mc.addLocation(newVid, loc) - } - for _, deletedVid := range volumeLocation.DeletedVids { - glog.V(1).Infof("%s: %s removes volume %d", mc.name, loc.Url, deletedVid) - mc.deleteLocation(deletedVid, loc) - } - } + for _, newVid := range volumeLocation.NewVids { + glog.V(1).Infof("%s: %s adds volume %d", mc.name, loc.Url, newVid) + mc.addLocation(newVid, loc) + } + for _, deletedVid := range volumeLocation.DeletedVids { + glog.V(1).Infof("%s: %s removes volume %d", mc.name, loc.Url, deletedVid) + mc.deleteLocation(deletedVid, loc) } - - }) - - if gprcErr != nil { - glog.V(0).Infof("%s failed to connect with master %v: %v", mc.name, master, gprcErr) } - mc.currentMaster = "" + }) + if gprcErr != nil { + glog.V(0).Infof("%s failed to connect with master %v: %v", mc.name, master, gprcErr) } + return } func withMasterClient(ctx context.Context, master string, grpcDialOption grpc.DialOption, fn func(ctx context.Context, client master_pb.SeaweedClient) error) error { |