From bdc337a71938dfa0821203a79dd4a0f7e69df6ab Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Thu, 23 Apr 2020 03:50:05 -0700 Subject: [PATCH] make lock/unlock optional --- weed/pb/master.proto | 10 - weed/pb/master_pb/master.pb.go | 371 +++++++++--------------- weed/server/master_grpc_server_admin.go | 18 +- 3 files changed, 147 insertions(+), 252 deletions(-) diff --git a/weed/pb/master.proto b/weed/pb/master.proto index 29fd9d0e2..3b5636791 100644 --- a/weed/pb/master.proto +++ b/weed/pb/master.proto @@ -31,8 +31,6 @@ service Seaweed { } rpc ReleaseAdminToken (ReleaseAdminTokenRequest) returns (ReleaseAdminTokenResponse) { } - rpc VerifyAdminToken (VerifyAdminTokenRequest) returns (VerifyAdminTokenResponse) { - } } @@ -297,11 +295,3 @@ message ReleaseAdminTokenRequest { } message ReleaseAdminTokenResponse { } - -message VerifyAdminTokenRequest { - int64 token = 1; - int64 lock_time = 2; -} -message VerifyAdminTokenResponse { - bool is_valid = 1; -} diff --git a/weed/pb/master_pb/master.pb.go b/weed/pb/master_pb/master.pb.go index 727cce157..80fc9fe49 100644 --- a/weed/pb/master_pb/master.pb.go +++ b/weed/pb/master_pb/master.pb.go @@ -48,8 +48,6 @@ It has these top-level messages: LeaseAdminTokenResponse ReleaseAdminTokenRequest ReleaseAdminTokenResponse - VerifyAdminTokenRequest - VerifyAdminTokenResponse */ package master_pb @@ -1559,46 +1557,6 @@ func (m *ReleaseAdminTokenResponse) String() string { return proto.Co func (*ReleaseAdminTokenResponse) ProtoMessage() {} func (*ReleaseAdminTokenResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{38} } -type VerifyAdminTokenRequest struct { - Token int64 `protobuf:"varint,1,opt,name=token" json:"token,omitempty"` - LockTime int64 `protobuf:"varint,2,opt,name=lock_time,json=lockTime" json:"lock_time,omitempty"` -} - -func (m *VerifyAdminTokenRequest) Reset() { *m = VerifyAdminTokenRequest{} } -func (m *VerifyAdminTokenRequest) String() string { return proto.CompactTextString(m) } -func (*VerifyAdminTokenRequest) ProtoMessage() {} -func (*VerifyAdminTokenRequest) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{39} } - -func (m *VerifyAdminTokenRequest) GetToken() int64 { - if m != nil { - return m.Token - } - return 0 -} - -func (m *VerifyAdminTokenRequest) GetLockTime() int64 { - if m != nil { - return m.LockTime - } - return 0 -} - -type VerifyAdminTokenResponse struct { - IsValid bool `protobuf:"varint,1,opt,name=is_valid,json=isValid" json:"is_valid,omitempty"` -} - -func (m *VerifyAdminTokenResponse) Reset() { *m = VerifyAdminTokenResponse{} } -func (m *VerifyAdminTokenResponse) String() string { return proto.CompactTextString(m) } -func (*VerifyAdminTokenResponse) ProtoMessage() {} -func (*VerifyAdminTokenResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{40} } - -func (m *VerifyAdminTokenResponse) GetIsValid() bool { - if m != nil { - return m.IsValid - } - return false -} - func init() { proto.RegisterType((*Heartbeat)(nil), "master_pb.Heartbeat") proto.RegisterType((*HeartbeatResponse)(nil), "master_pb.HeartbeatResponse") @@ -1642,8 +1600,6 @@ func init() { proto.RegisterType((*LeaseAdminTokenResponse)(nil), "master_pb.LeaseAdminTokenResponse") proto.RegisterType((*ReleaseAdminTokenRequest)(nil), "master_pb.ReleaseAdminTokenRequest") proto.RegisterType((*ReleaseAdminTokenResponse)(nil), "master_pb.ReleaseAdminTokenResponse") - proto.RegisterType((*VerifyAdminTokenRequest)(nil), "master_pb.VerifyAdminTokenRequest") - proto.RegisterType((*VerifyAdminTokenResponse)(nil), "master_pb.VerifyAdminTokenResponse") } // Reference imports to suppress errors if they are not otherwise used. @@ -1670,7 +1626,6 @@ type SeaweedClient interface { ListMasterClients(ctx context.Context, in *ListMasterClientsRequest, opts ...grpc.CallOption) (*ListMasterClientsResponse, error) LeaseAdminToken(ctx context.Context, in *LeaseAdminTokenRequest, opts ...grpc.CallOption) (*LeaseAdminTokenResponse, error) ReleaseAdminToken(ctx context.Context, in *ReleaseAdminTokenRequest, opts ...grpc.CallOption) (*ReleaseAdminTokenResponse, error) - VerifyAdminToken(ctx context.Context, in *VerifyAdminTokenRequest, opts ...grpc.CallOption) (*VerifyAdminTokenResponse, error) } type seaweedClient struct { @@ -1842,15 +1797,6 @@ func (c *seaweedClient) ReleaseAdminToken(ctx context.Context, in *ReleaseAdminT return out, nil } -func (c *seaweedClient) VerifyAdminToken(ctx context.Context, in *VerifyAdminTokenRequest, opts ...grpc.CallOption) (*VerifyAdminTokenResponse, error) { - out := new(VerifyAdminTokenResponse) - err := grpc.Invoke(ctx, "/master_pb.Seaweed/VerifyAdminToken", in, out, c.cc, opts...) - if err != nil { - return nil, err - } - return out, nil -} - // Server API for Seaweed service type SeaweedServer interface { @@ -1867,7 +1813,6 @@ type SeaweedServer interface { ListMasterClients(context.Context, *ListMasterClientsRequest) (*ListMasterClientsResponse, error) LeaseAdminToken(context.Context, *LeaseAdminTokenRequest) (*LeaseAdminTokenResponse, error) ReleaseAdminToken(context.Context, *ReleaseAdminTokenRequest) (*ReleaseAdminTokenResponse, error) - VerifyAdminToken(context.Context, *VerifyAdminTokenRequest) (*VerifyAdminTokenResponse, error) } func RegisterSeaweedServer(s *grpc.Server, srv SeaweedServer) { @@ -2124,24 +2069,6 @@ func _Seaweed_ReleaseAdminToken_Handler(srv interface{}, ctx context.Context, de return interceptor(ctx, in, info, handler) } -func _Seaweed_VerifyAdminToken_Handler(srv interface{}, ctx context.Context, dec func(interface{}) error, interceptor grpc.UnaryServerInterceptor) (interface{}, error) { - in := new(VerifyAdminTokenRequest) - if err := dec(in); err != nil { - return nil, err - } - if interceptor == nil { - return srv.(SeaweedServer).VerifyAdminToken(ctx, in) - } - info := &grpc.UnaryServerInfo{ - Server: srv, - FullMethod: "/master_pb.Seaweed/VerifyAdminToken", - } - handler := func(ctx context.Context, req interface{}) (interface{}, error) { - return srv.(SeaweedServer).VerifyAdminToken(ctx, req.(*VerifyAdminTokenRequest)) - } - return interceptor(ctx, in, info, handler) -} - var _Seaweed_serviceDesc = grpc.ServiceDesc{ ServiceName: "master_pb.Seaweed", HandlerType: (*SeaweedServer)(nil), @@ -2190,10 +2117,6 @@ var _Seaweed_serviceDesc = grpc.ServiceDesc{ MethodName: "ReleaseAdminToken", Handler: _Seaweed_ReleaseAdminToken_Handler, }, - { - MethodName: "VerifyAdminToken", - Handler: _Seaweed_VerifyAdminToken_Handler, - }, }, Streams: []grpc.StreamDesc{ { @@ -2215,154 +2138,150 @@ var _Seaweed_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("master.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 2380 bytes of a gzipped FileDescriptorProto + // 2320 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x59, 0x4b, 0x6f, 0x1c, 0xc7, - 0x11, 0xd6, 0xee, 0xf2, 0xb1, 0x5b, 0xcb, 0x7d, 0x35, 0x29, 0x6a, 0xb9, 0xb2, 0x44, 0x6a, 0x6c, - 0xc3, 0x94, 0xe2, 0x30, 0x0e, 0xed, 0x20, 0x46, 0x1c, 0xc3, 0xa0, 0x28, 0x5a, 0x21, 0x44, 0xd2, - 0xd2, 0x90, 0x91, 0x01, 0x03, 0xc1, 0xb8, 0x77, 0xa6, 0x49, 0x35, 0x38, 0xaf, 0x4c, 0xf7, 0x52, - 0x5c, 0xe7, 0x12, 0x20, 0xc7, 0x9c, 0x82, 0x1c, 0xf2, 0x17, 0x72, 0xc9, 0x29, 0x39, 0xfb, 0x92, - 0xff, 0x90, 0x1f, 0x92, 0xab, 0x2f, 0x41, 0x3f, 0x66, 0xa6, 0x67, 0x76, 0x97, 0x34, 0x0d, 0x38, - 0x80, 0x6e, 0xd3, 0x55, 0xd5, 0xd5, 0xd5, 0x5f, 0x75, 0xd7, 0xa3, 0x07, 0x96, 0x02, 0xcc, 0x38, - 0x49, 0xb6, 0xe2, 0x24, 0xe2, 0x11, 0x6a, 0xa8, 0x91, 0x13, 0x0f, 0xad, 0x3f, 0x2f, 0x40, 0xe3, - 0x37, 0x04, 0x27, 0x7c, 0x48, 0x30, 0x47, 0x6d, 0xa8, 0xd2, 0xb8, 0x5f, 0xd9, 0xa8, 0x6c, 0x36, - 0xec, 0x2a, 0x8d, 0x11, 0x82, 0xb9, 0x38, 0x4a, 0x78, 0xbf, 0xba, 0x51, 0xd9, 0x6c, 0xd9, 0xf2, - 0x1b, 0xdd, 0x03, 0x88, 0x47, 0x43, 0x9f, 0xba, 0xce, 0x28, 0xf1, 0xfb, 0x35, 0x29, 0xdb, 0x50, - 0x94, 0xdf, 0x26, 0x3e, 0xda, 0x84, 0x6e, 0x80, 0x2f, 0x9d, 0x8b, 0xc8, 0x1f, 0x05, 0xc4, 0x71, - 0xa3, 0x51, 0xc8, 0xfb, 0x73, 0x72, 0x7a, 0x3b, 0xc0, 0x97, 0x2f, 0x25, 0x79, 0x57, 0x50, 0xd1, - 0x86, 0xb0, 0xea, 0xd2, 0x39, 0xa5, 0x3e, 0x71, 0xce, 0xc9, 0xb8, 0x3f, 0xbf, 0x51, 0xd9, 0x9c, - 0xb3, 0x21, 0xc0, 0x97, 0x9f, 0x53, 0x9f, 0x3c, 0x23, 0x63, 0xb4, 0x0e, 0x4d, 0x0f, 0x73, 0xec, - 0xb8, 0x24, 0xe4, 0x24, 0xe9, 0x2f, 0xc8, 0xb5, 0x40, 0x90, 0x76, 0x25, 0x45, 0xd8, 0x97, 0x60, - 0xf7, 0xbc, 0xbf, 0x28, 0x39, 0xf2, 0x5b, 0xd8, 0x87, 0xbd, 0x80, 0x86, 0x8e, 0xb4, 0xbc, 0x2e, - 0x97, 0x6e, 0x48, 0xca, 0x73, 0x61, 0xfe, 0xa7, 0xb0, 0xa8, 0x6c, 0x63, 0xfd, 0xc6, 0x46, 0x6d, - 0xb3, 0xb9, 0xfd, 0xf6, 0x56, 0x86, 0xc6, 0x96, 0x32, 0x6f, 0x3f, 0x3c, 0x8d, 0x92, 0x00, 0x73, - 0x1a, 0x85, 0x87, 0x84, 0x31, 0x7c, 0x46, 0xec, 0x74, 0x0e, 0xda, 0x87, 0x66, 0x48, 0x5e, 0x3b, - 0xa9, 0x0a, 0x90, 0x2a, 0x36, 0x27, 0x54, 0x1c, 0xbf, 0x8a, 0x12, 0x3e, 0x45, 0x0f, 0x84, 0xe4, - 0xf5, 0x4b, 0xad, 0xea, 0x05, 0x74, 0x3c, 0xe2, 0x13, 0x4e, 0xbc, 0x4c, 0x5d, 0xf3, 0x86, 0xea, - 0xda, 0x5a, 0x41, 0xaa, 0xf2, 0x1d, 0x68, 0xbf, 0xc2, 0xcc, 0x09, 0xa3, 0x4c, 0xe3, 0xd2, 0x46, - 0x65, 0xb3, 0x6e, 0x2f, 0xbd, 0xc2, 0xec, 0x28, 0x4a, 0xa5, 0x9e, 0x42, 0x83, 0xb8, 0x0e, 0x7b, - 0x85, 0x13, 0x8f, 0xf5, 0xbb, 0x72, 0xc9, 0x47, 0x13, 0x4b, 0xee, 0xb9, 0xc7, 0x42, 0x60, 0xca, - 0xa2, 0x75, 0xa2, 0x58, 0x0c, 0x1d, 0x41, 0x4b, 0x80, 0x91, 0x2b, 0xeb, 0xdd, 0x58, 0x99, 0x40, - 0x73, 0x2f, 0xd5, 0xf7, 0x12, 0x7a, 0x29, 0x22, 0xb9, 0x4e, 0x74, 0x63, 0x9d, 0x29, 0xac, 0x99, - 0xde, 0xf7, 0xa0, 0xab, 0x61, 0xc9, 0xd5, 0x2e, 0x4b, 0x60, 0x5a, 0x12, 0x98, 0x54, 0xd0, 0xfa, - 0x63, 0x15, 0x7a, 0xd9, 0x6d, 0xb0, 0x09, 0x8b, 0xa3, 0x90, 0x11, 0xf4, 0x08, 0x7a, 0xfa, 0x38, - 0x33, 0xfa, 0x0d, 0x71, 0x7c, 0x1a, 0x50, 0x2e, 0x2f, 0xc9, 0x9c, 0xdd, 0x51, 0x8c, 0x63, 0xfa, - 0x0d, 0x39, 0x10, 0x64, 0xb4, 0x0a, 0x0b, 0x3e, 0xc1, 0x1e, 0x49, 0xe4, 0x9d, 0x69, 0xd8, 0x7a, - 0x84, 0xde, 0x83, 0x4e, 0x40, 0x78, 0x42, 0x5d, 0xe6, 0x60, 0xcf, 0x4b, 0x08, 0x63, 0xfa, 0xea, - 0xb4, 0x35, 0x79, 0x47, 0x51, 0xd1, 0xc7, 0xd0, 0x4f, 0x05, 0xa9, 0x38, 0xe3, 0x17, 0xd8, 0x77, - 0x18, 0x71, 0xa3, 0xd0, 0x63, 0xfa, 0x1e, 0xad, 0x6a, 0xfe, 0xbe, 0x66, 0x1f, 0x2b, 0x2e, 0x7a, - 0x02, 0x5d, 0xc6, 0xa3, 0x04, 0x9f, 0x11, 0x67, 0x88, 0xdd, 0x73, 0x22, 0x66, 0xcc, 0x4b, 0xf0, - 0xd6, 0x0c, 0xf0, 0x8e, 0x95, 0xc8, 0x63, 0x25, 0x61, 0x77, 0x58, 0x61, 0xcc, 0xac, 0xef, 0x6a, - 0xd0, 0x9f, 0x75, 0x0d, 0x64, 0x7c, 0xf0, 0xe4, 0xd6, 0x5b, 0x76, 0x95, 0x7a, 0xe2, 0xfe, 0x09, - 0x48, 0xe4, 0x5e, 0xe7, 0x6c, 0xf9, 0x8d, 0xee, 0x03, 0xb8, 0x91, 0xef, 0x13, 0x57, 0x4c, 0xd4, - 0x9b, 0x34, 0x28, 0xe2, 0x7e, 0xca, 0x2b, 0x9f, 0x87, 0x86, 0x39, 0xbb, 0x21, 0x28, 0x2a, 0x2a, - 0x3c, 0x80, 0x25, 0xe5, 0x3e, 0x2d, 0xa0, 0xa2, 0x42, 0x53, 0xd1, 0x94, 0xc8, 0xfb, 0x80, 0xd2, - 0x63, 0x32, 0x1c, 0x67, 0x82, 0x0b, 0x52, 0xb0, 0xab, 0x39, 0x8f, 0xc7, 0xa9, 0xf4, 0x5d, 0x68, - 0x24, 0x04, 0x7b, 0x4e, 0x14, 0xfa, 0x63, 0x19, 0x28, 0xea, 0x76, 0x5d, 0x10, 0xbe, 0x08, 0xfd, - 0x31, 0xfa, 0x09, 0xf4, 0x12, 0x12, 0xfb, 0xd4, 0xc5, 0x4e, 0xec, 0x63, 0x97, 0x04, 0x24, 0x4c, - 0x63, 0x46, 0x57, 0x33, 0x9e, 0xa7, 0x74, 0xd4, 0x87, 0xc5, 0x0b, 0x92, 0x30, 0xb1, 0xad, 0x86, - 0x14, 0x49, 0x87, 0xa8, 0x0b, 0x35, 0xce, 0xfd, 0x3e, 0x48, 0xaa, 0xf8, 0x44, 0x0f, 0xa1, 0xeb, - 0x46, 0x41, 0x8c, 0x5d, 0xee, 0x24, 0xe4, 0x82, 0xca, 0x49, 0x4d, 0xc9, 0xee, 0x68, 0xba, 0xad, - 0xc9, 0x62, 0x3b, 0x41, 0xe4, 0xd1, 0x53, 0x4a, 0x3c, 0x07, 0x73, 0xed, 0x6c, 0x79, 0x71, 0x6b, - 0x76, 0x37, 0xe5, 0xec, 0x70, 0xe5, 0x66, 0xb4, 0x05, 0xcb, 0x09, 0x09, 0x22, 0x4e, 0x9c, 0xd4, - 0xd9, 0x21, 0x0e, 0x48, 0xbf, 0x25, 0x71, 0xee, 0x29, 0x96, 0xf6, 0xf1, 0x11, 0x0e, 0x88, 0xd0, - 0x5e, 0x92, 0x17, 0xb1, 0xb6, 0x2d, 0xc5, 0xbb, 0x05, 0xf1, 0x67, 0x64, 0x6c, 0xfd, 0xbd, 0x02, - 0xf7, 0xae, 0x0c, 0x39, 0x13, 0x47, 0xe0, 0x3a, 0x77, 0xff, 0x58, 0x08, 0x5b, 0x23, 0x58, 0xbf, - 0x26, 0x10, 0x5c, 0x63, 0x6b, 0x75, 0xc2, 0x56, 0x0b, 0x5a, 0xc4, 0x75, 0x68, 0xe8, 0x91, 0x4b, - 0x67, 0x48, 0xb9, 0xba, 0xa2, 0x2d, 0xbb, 0x49, 0xdc, 0x7d, 0x41, 0x7b, 0x4c, 0x39, 0xb3, 0xbe, - 0xad, 0x40, 0xbb, 0x78, 0x87, 0xc4, 0x2d, 0xe0, 0xe3, 0x98, 0xe8, 0xbc, 0x29, 0xbf, 0xf5, 0xd2, - 0x55, 0x9d, 0x49, 0x3d, 0xb4, 0x0f, 0x10, 0x27, 0x51, 0x4c, 0x12, 0x4e, 0x89, 0xd0, 0x2b, 0xae, - 0xe5, 0xc3, 0x99, 0xd7, 0x72, 0xeb, 0x79, 0x26, 0xbb, 0x17, 0xf2, 0x64, 0x6c, 0x1b, 0x93, 0x07, - 0x9f, 0x42, 0xa7, 0xc4, 0x16, 0xe8, 0x08, 0xaf, 0x2a, 0x03, 0xc4, 0x27, 0x5a, 0x81, 0xf9, 0x0b, - 0xec, 0x8f, 0x88, 0x36, 0x41, 0x0d, 0x7e, 0x55, 0xfd, 0xb8, 0x62, 0x2d, 0xc2, 0xfc, 0x5e, 0x10, - 0xf3, 0xb1, 0xd8, 0x49, 0xe7, 0x78, 0x14, 0x93, 0xe4, 0xb1, 0x1f, 0xb9, 0xe7, 0x7b, 0x97, 0x3c, - 0xc1, 0xe8, 0x0b, 0x68, 0x93, 0x04, 0xb3, 0x51, 0x22, 0x6e, 0x95, 0x47, 0xc3, 0x33, 0xa9, 0xb3, - 0x98, 0x92, 0x4a, 0x73, 0xb6, 0xf6, 0xd4, 0x84, 0x5d, 0x29, 0x6f, 0xb7, 0x88, 0x39, 0x1c, 0x7c, - 0x05, 0xad, 0x02, 0x5f, 0x80, 0x25, 0x12, 0xb8, 0xf6, 0x8a, 0xfc, 0x16, 0x41, 0x33, 0xc6, 0x09, - 0xe5, 0x63, 0x5d, 0x68, 0xe8, 0x91, 0x08, 0x15, 0x3a, 0xf0, 0x52, 0x4f, 0x81, 0xd6, 0xb2, 0x1b, - 0x8a, 0xb2, 0xef, 0x31, 0xeb, 0x29, 0xac, 0x3c, 0x23, 0x24, 0xde, 0x8d, 0xc2, 0x90, 0xb8, 0x9c, - 0x78, 0x36, 0xf9, 0xfd, 0x88, 0x30, 0x2e, 0x96, 0x90, 0x77, 0x42, 0xfb, 0x43, 0x7c, 0x8b, 0x28, - 0x70, 0x96, 0xc4, 0xae, 0x63, 0x94, 0x33, 0x75, 0x41, 0x10, 0x35, 0x81, 0xf5, 0xb7, 0x0a, 0xb4, - 0xd5, 0x59, 0x3a, 0x88, 0x5c, 0x79, 0x82, 0x04, 0xa2, 0xa2, 0xbc, 0xd1, 0x88, 0x8e, 0x12, 0xbf, - 0x54, 0xf7, 0x54, 0xcb, 0x75, 0xcf, 0x1a, 0xd4, 0x65, 0x61, 0x90, 0x5b, 0xba, 0x28, 0x72, 0x3d, - 0xf5, 0x58, 0x1e, 0xd2, 0x3c, 0xc5, 0x9e, 0x93, 0xec, 0x66, 0x9a, 0xbb, 0x85, 0x48, 0x9e, 0x36, - 0xe6, 0xcd, 0xb4, 0x61, 0x9d, 0xc0, 0xf2, 0x41, 0x14, 0x9d, 0x8f, 0x62, 0x65, 0x5e, 0xba, 0xc3, - 0x22, 0x30, 0x95, 0x8d, 0x9a, 0xb0, 0x25, 0x03, 0xe6, 0xba, 0x73, 0x6e, 0xfd, 0xb7, 0x02, 0x2b, - 0x45, 0xb5, 0x3a, 0xd3, 0x7d, 0x0d, 0xcb, 0x99, 0x5e, 0xc7, 0xd7, 0x58, 0xa8, 0x05, 0x9a, 0xdb, - 0x1f, 0x18, 0x67, 0x60, 0xda, 0xec, 0xb4, 0x7a, 0xf2, 0x52, 0x10, 0xed, 0xde, 0x45, 0x89, 0xc2, - 0x06, 0x97, 0xd0, 0x2d, 0x8b, 0x09, 0xdf, 0x64, 0xab, 0x6a, 0xc4, 0xeb, 0xe9, 0x4c, 0xf4, 0x73, - 0x68, 0xe4, 0x86, 0x54, 0xa5, 0x21, 0xcb, 0x05, 0x43, 0xf4, 0x5a, 0xb9, 0x94, 0x38, 0xfb, 0x24, - 0x49, 0xa2, 0x44, 0x47, 0x23, 0x35, 0xb0, 0x3e, 0x81, 0xfa, 0x0f, 0xf6, 0xae, 0xf5, 0xcf, 0x2a, - 0xb4, 0x76, 0x18, 0xa3, 0x67, 0x61, 0xea, 0x82, 0x15, 0x98, 0x57, 0x79, 0x47, 0x15, 0x02, 0x6a, - 0x80, 0x36, 0xa0, 0xa9, 0x83, 0x9a, 0x01, 0xbd, 0x49, 0xba, 0x36, 0x5e, 0xea, 0x40, 0x37, 0xa7, - 0x4c, 0x13, 0xa9, 0xa4, 0x54, 0x05, 0xcf, 0xcf, 0xac, 0x82, 0x17, 0x8c, 0x2a, 0xf8, 0x2e, 0x34, - 0xe4, 0xa4, 0x30, 0xf2, 0x88, 0x2e, 0x8f, 0xeb, 0x82, 0x70, 0x14, 0x79, 0x04, 0x6d, 0xc3, 0x6a, - 0x40, 0x82, 0x28, 0x19, 0x3b, 0x01, 0x8e, 0x1d, 0x51, 0x84, 0xcb, 0xc2, 0x26, 0x18, 0xea, 0xc0, - 0x8c, 0x14, 0xf7, 0x10, 0xc7, 0x87, 0xf8, 0x52, 0xd4, 0x36, 0x87, 0x43, 0xb4, 0x0d, 0xb7, 0xbf, - 0x4c, 0x28, 0xc7, 0x43, 0x9f, 0x14, 0x8b, 0x7b, 0x15, 0xa8, 0x97, 0x53, 0xa6, 0x51, 0xe1, 0x5b, - 0x7f, 0xad, 0x40, 0x3b, 0x45, 0x4d, 0x9f, 0xb0, 0x2e, 0xd4, 0x4e, 0x33, 0x2f, 0x8b, 0xcf, 0xd4, - 0x17, 0xd5, 0x59, 0xbe, 0x98, 0xe8, 0x30, 0x32, 0xe4, 0xe7, 0x4c, 0xe4, 0x33, 0xa7, 0xcf, 0x1b, - 0x4e, 0x17, 0xd0, 0xe0, 0x11, 0x7f, 0x95, 0x42, 0x23, 0xbe, 0xad, 0x33, 0xe8, 0x1d, 0x73, 0xcc, - 0x29, 0xe3, 0xd4, 0x65, 0xa9, 0x3b, 0x4b, 0x8e, 0xab, 0x5c, 0xe7, 0xb8, 0xea, 0x2c, 0xc7, 0xd5, - 0x32, 0xc7, 0x59, 0xff, 0xae, 0x00, 0x32, 0x57, 0xd2, 0x10, 0xfc, 0x08, 0x4b, 0x09, 0xc8, 0x78, - 0xc4, 0x45, 0xa9, 0x28, 0xca, 0x31, 0x5d, 0x54, 0x49, 0x8a, 0x70, 0x9f, 0x38, 0x0d, 0x23, 0x46, - 0x3c, 0xc5, 0x55, 0x15, 0x55, 0x5d, 0x10, 0x24, 0xb3, 0x58, 0x90, 0x2d, 0x94, 0x0a, 0x32, 0x6b, - 0x07, 0x9a, 0x3a, 0x39, 0x9d, 0x88, 0xc4, 0x76, 0xbd, 0xf5, 0xda, 0xba, 0x6a, 0x0e, 0xc4, 0x06, - 0xc0, 0x6e, 0x6e, 0xfd, 0x94, 0xf0, 0x6c, 0xfd, 0x01, 0x6e, 0xe7, 0x12, 0x07, 0x94, 0xf1, 0xd4, - 0x2f, 0x1f, 0xc1, 0x2a, 0x0d, 0x5d, 0x7f, 0xe4, 0x11, 0x27, 0x14, 0xe9, 0xdd, 0xcf, 0x3a, 0x9b, - 0x8a, 0x2c, 0xe5, 0x56, 0x34, 0xf7, 0x48, 0x32, 0xd3, 0x0e, 0xe7, 0x7d, 0x40, 0xe9, 0x2c, 0xe2, - 0x66, 0x33, 0xaa, 0x72, 0x46, 0x57, 0x73, 0xf6, 0x5c, 0x2d, 0x6d, 0xbd, 0x80, 0xd5, 0xf2, 0xe2, - 0xda, 0x55, 0xbf, 0x84, 0x66, 0x0e, 0x7b, 0x1a, 0x07, 0x6f, 0x1b, 0xe1, 0x27, 0x9f, 0x67, 0x9b, - 0x92, 0xd6, 0x4f, 0xe1, 0x4e, 0xce, 0x7a, 0x22, 0x03, 0xfd, 0x15, 0xd9, 0xc9, 0x1a, 0x40, 0x7f, - 0x52, 0x5c, 0xd9, 0x60, 0xfd, 0xa5, 0x06, 0x4b, 0x4f, 0xf4, 0xcd, 0x15, 0x35, 0x8e, 0x51, 0xd5, - 0xa8, 0xd2, 0xe2, 0x01, 0x2c, 0x15, 0x2e, 0xa4, 0x2a, 0xc6, 0x9b, 0x17, 0x46, 0xab, 0x3d, 0xad, - 0x29, 0xaf, 0x49, 0xb1, 0x72, 0x53, 0xfe, 0x08, 0x7a, 0xa7, 0x09, 0x21, 0x93, 0xfd, 0xfb, 0x9c, - 0xdd, 0x11, 0x0c, 0x53, 0x76, 0x0b, 0x96, 0xb1, 0xcb, 0xe9, 0x45, 0x49, 0x5a, 0x9d, 0xaf, 0x9e, - 0x62, 0x99, 0xf2, 0x9f, 0x67, 0x86, 0xd2, 0xf0, 0x34, 0x62, 0xfd, 0x85, 0xef, 0xdf, 0x7f, 0xeb, - 0xdd, 0x08, 0x0e, 0x43, 0xcf, 0xa1, 0x9d, 0xf6, 0x71, 0x5a, 0xd3, 0xe2, 0x8d, 0x7b, 0xc4, 0x25, - 0x92, 0xb3, 0x98, 0x51, 0x54, 0x17, 0x76, 0x52, 0x57, 0x3b, 0x51, 0x2c, 0x33, 0xb0, 0xfd, 0xab, - 0x0a, 0x75, 0x1b, 0xbb, 0xe7, 0x6f, 0xb6, 0x3f, 0x3e, 0x83, 0x4e, 0x96, 0x23, 0x0a, 0x2e, 0xb9, - 0x63, 0x00, 0x69, 0x1e, 0x3d, 0xbb, 0xe5, 0x19, 0xa3, 0x99, 0xb0, 0x2d, 0xce, 0x82, 0xed, 0x1f, - 0x55, 0x68, 0x3f, 0xc9, 0xf2, 0xd6, 0x9b, 0x0d, 0xde, 0x36, 0x80, 0x48, 0xb4, 0x05, 0xdc, 0xcc, - 0xc2, 0x24, 0x3d, 0x1e, 0x76, 0x23, 0xd1, 0x5f, 0x37, 0xc7, 0xeb, 0xdb, 0x2a, 0x2c, 0x9d, 0x44, - 0x71, 0xe4, 0x47, 0x67, 0xe3, 0x37, 0x1b, 0xad, 0x3d, 0xe8, 0x19, 0x35, 0x4c, 0x01, 0xb4, 0xb5, - 0xd2, 0x61, 0xcb, 0x0f, 0x87, 0xdd, 0xf1, 0x0a, 0xe3, 0x9b, 0x03, 0xb8, 0x0c, 0x3d, 0x5d, 0xd7, - 0xe7, 0x29, 0xc5, 0xfa, 0x53, 0x05, 0x90, 0x49, 0xd5, 0xb1, 0xfe, 0xd7, 0xd0, 0xe2, 0x1a, 0x6b, - 0x69, 0x9f, 0xee, 0x7c, 0xcc, 0xbb, 0x60, 0xfa, 0xc2, 0x5e, 0xe2, 0xa6, 0x67, 0x7e, 0x06, 0x2b, - 0x13, 0x6f, 0x44, 0xa2, 0xa0, 0x52, 0x1e, 0xe9, 0x95, 0x9e, 0x89, 0x0e, 0x87, 0xd6, 0x47, 0x70, - 0x5b, 0x15, 0xd1, 0x69, 0x1e, 0x4a, 0xf3, 0xc3, 0x44, 0x35, 0xdc, 0xca, 0xab, 0x61, 0xeb, 0xbb, - 0x0a, 0xac, 0x96, 0xa7, 0x69, 0xfb, 0xaf, 0x9a, 0x87, 0x30, 0x20, 0x1d, 0x2f, 0xcd, 0xba, 0x5e, - 0x95, 0xd3, 0x1f, 0x4e, 0xd4, 0xf5, 0x65, 0xdd, 0x5b, 0x69, 0x1c, 0xcd, 0x4b, 0xfb, 0x2e, 0x2b, - 0x12, 0xd8, 0x00, 0x43, 0x6f, 0x42, 0x4c, 0x74, 0x45, 0xe9, 0xba, 0xda, 0xa6, 0x45, 0x3d, 0xf1, - 0x07, 0x14, 0xf6, 0xd6, 0x3a, 0xdc, 0x7b, 0x4a, 0xf8, 0xa1, 0x94, 0xd9, 0x8d, 0xc2, 0x53, 0x7a, - 0x36, 0x4a, 0x94, 0x50, 0xee, 0xda, 0xfb, 0xb3, 0x24, 0x34, 0x4c, 0x53, 0x1e, 0xe2, 0x2a, 0x37, - 0x7e, 0x88, 0xab, 0x5e, 0xf5, 0x10, 0x67, 0x7d, 0x02, 0x7d, 0x71, 0xb2, 0xb4, 0x15, 0x3e, 0x25, - 0x21, 0xcf, 0xea, 0xcc, 0x75, 0x68, 0xba, 0x92, 0xe2, 0x18, 0x4f, 0x06, 0xa0, 0x48, 0xa2, 0xbe, - 0xb2, 0x1e, 0xc3, 0xda, 0x94, 0xc9, 0xda, 0xf8, 0x77, 0xa1, 0x2d, 0xbb, 0x58, 0x6d, 0x39, 0x49, - 0x7b, 0xbf, 0x96, 0xa0, 0xee, 0xa4, 0x44, 0x2b, 0x80, 0xd5, 0x03, 0x82, 0x19, 0xd9, 0xf1, 0x02, - 0x1a, 0x9e, 0x44, 0xe7, 0x24, 0xeb, 0x5a, 0xde, 0x85, 0x76, 0x9c, 0x90, 0x0b, 0x1a, 0x8d, 0x98, - 0xc3, 0x05, 0x43, 0x5a, 0x50, 0xb3, 0x5b, 0x29, 0x55, 0x4a, 0x8b, 0xfa, 0x29, 0x13, 0x13, 0x8d, - 0xbe, 0xc3, 0x69, 0xa0, 0x9e, 0x12, 0x6a, 0x76, 0x37, 0xe5, 0x1c, 0x44, 0xee, 0xf9, 0x09, 0x0d, - 0x88, 0x75, 0x08, 0x77, 0x26, 0x96, 0xd3, 0x06, 0xaf, 0xc0, 0xbc, 0xb9, 0x8c, 0x1a, 0xa0, 0xb7, - 0x00, 0x94, 0x56, 0xe6, 0x84, 0x4c, 0xab, 0xad, 0x0b, 0xca, 0x09, 0x3b, 0x62, 0x56, 0x04, 0x7d, - 0x9b, 0xf8, 0xff, 0x47, 0xfb, 0xef, 0xc2, 0xda, 0x94, 0x05, 0x75, 0xf9, 0x75, 0x00, 0x77, 0x5e, - 0x92, 0x84, 0x9e, 0x8e, 0x27, 0x8d, 0x99, 0xbe, 0xb9, 0xbb, 0xf2, 0x5c, 0x17, 0x96, 0x54, 0x7b, - 0x13, 0x4b, 0xfd, 0x02, 0xfa, 0x93, 0xda, 0x34, 0x56, 0x6b, 0x50, 0xa7, 0xcc, 0xb9, 0xc0, 0xbe, - 0xbe, 0x2b, 0x75, 0x7b, 0x91, 0xb2, 0x97, 0x62, 0xb8, 0xfd, 0x9f, 0x06, 0x2c, 0x1e, 0x13, 0xfc, - 0x9a, 0x10, 0x0f, 0xed, 0x43, 0xeb, 0x98, 0x84, 0x5e, 0xfe, 0xd3, 0x66, 0xc5, 0xb8, 0x35, 0x19, - 0x75, 0xf0, 0xd6, 0x34, 0x6a, 0xb6, 0xab, 0x5b, 0x9b, 0x95, 0x0f, 0x2a, 0xe8, 0x05, 0xb4, 0x0a, - 0x0f, 0x28, 0x68, 0xdd, 0x98, 0x34, 0xed, 0x69, 0x65, 0xb0, 0x36, 0x51, 0x62, 0xa5, 0xf7, 0x34, - 0x53, 0xb9, 0x64, 0xbe, 0x0d, 0xa0, 0xfb, 0x33, 0x1f, 0x0d, 0x94, 0xc2, 0xf5, 0x6b, 0x1e, 0x15, - 0xac, 0x5b, 0xe8, 0x33, 0x58, 0x50, 0x4d, 0x24, 0xea, 0x1b, 0xc2, 0x85, 0x6e, 0xbc, 0x60, 0x57, - 0xb1, 0xe3, 0xb4, 0x6e, 0xa1, 0x67, 0x00, 0x79, 0x1b, 0x86, 0xde, 0x2a, 0xbc, 0xba, 0x95, 0xfa, - 0xc0, 0xc1, 0xbd, 0x19, 0xdc, 0x4c, 0xd9, 0x97, 0xd0, 0x2e, 0x36, 0x0b, 0x68, 0x63, 0x6a, 0x3f, - 0x60, 0x64, 0x9c, 0xc1, 0x83, 0x2b, 0x24, 0x32, 0xc5, 0xbf, 0x83, 0x6e, 0xb9, 0x07, 0x40, 0xd6, - 0xd4, 0x89, 0x85, 0x7e, 0x62, 0xf0, 0xf6, 0x95, 0x32, 0x26, 0x08, 0x79, 0xd2, 0x2b, 0x80, 0x30, - 0x91, 0x21, 0x0b, 0x20, 0x4c, 0x66, 0x4a, 0x05, 0x42, 0x31, 0x53, 0x14, 0x40, 0x98, 0x9a, 0xd7, - 0x0a, 0x20, 0x4c, 0x4f, 0x33, 0xd6, 0x2d, 0x14, 0xc1, 0xea, 0xf4, 0xf8, 0x8d, 0xcc, 0x17, 0xc8, - 0x2b, 0x93, 0xc0, 0xe0, 0xe1, 0xf7, 0x90, 0xcc, 0x16, 0xfc, 0x1a, 0x7a, 0x13, 0xe1, 0x16, 0x99, - 0x90, 0xce, 0x8a, 0xe4, 0x83, 0x77, 0xae, 0x16, 0xca, 0x56, 0xf8, 0x0a, 0x3a, 0xa5, 0xe8, 0x88, - 0x0a, 0x50, 0x4c, 0x0d, 0x74, 0x03, 0xeb, 0x2a, 0x11, 0xd3, 0xfa, 0x89, 0xc8, 0x55, 0xb0, 0x7e, - 0x56, 0x20, 0x2d, 0x58, 0x3f, 0x3b, 0xf8, 0xc9, 0x53, 0x59, 0x0e, 0x58, 0x85, 0x53, 0x39, 0x23, - 0x36, 0x16, 0x4e, 0xe5, 0xac, 0x88, 0x67, 0xdd, 0x1a, 0x2e, 0xc8, 0x1f, 0xd2, 0x1f, 0xfe, 0x2f, - 0x00, 0x00, 0xff, 0xff, 0x9d, 0x02, 0x6b, 0x59, 0xa0, 0x1e, 0x00, 0x00, + 0xf1, 0xd7, 0xee, 0xf2, 0xb1, 0x5b, 0xcb, 0x7d, 0x35, 0x29, 0x6a, 0xb9, 0x7a, 0x90, 0x1a, 0xdb, + 0x30, 0xa5, 0xbf, 0xff, 0x8c, 0x43, 0x1b, 0x88, 0x11, 0xc7, 0x30, 0x28, 0x8a, 0x56, 0x08, 0x91, + 0xb4, 0x34, 0x64, 0x64, 0xc0, 0x40, 0x30, 0xee, 0x9d, 0x69, 0x52, 0x03, 0xce, 0x2b, 0xd3, 0xbd, + 0x14, 0xd7, 0xb9, 0x04, 0xc8, 0x31, 0xa7, 0x20, 0x87, 0x7c, 0x85, 0x5c, 0x72, 0x4a, 0xce, 0xbe, + 0xe4, 0x1b, 0xe5, 0x92, 0x83, 0x2f, 0x41, 0xbf, 0x66, 0x7a, 0x66, 0x77, 0x49, 0xd3, 0x80, 0x03, + 0xe8, 0x36, 0x5d, 0x55, 0x5d, 0x5d, 0xf3, 0xab, 0xee, 0xaa, 0x5f, 0xcf, 0xc0, 0x52, 0x88, 0x29, + 0x23, 0xe9, 0x56, 0x92, 0xc6, 0x2c, 0x46, 0x0d, 0x39, 0x72, 0x92, 0xa1, 0xf5, 0xa7, 0x05, 0x68, + 0xfc, 0x9a, 0xe0, 0x94, 0x0d, 0x09, 0x66, 0xa8, 0x0d, 0x55, 0x3f, 0xe9, 0x57, 0x36, 0x2a, 0x9b, + 0x0d, 0xbb, 0xea, 0x27, 0x08, 0xc1, 0x5c, 0x12, 0xa7, 0xac, 0x5f, 0xdd, 0xa8, 0x6c, 0xb6, 0x6c, + 0xf1, 0x8c, 0xee, 0x03, 0x24, 0xa3, 0x61, 0xe0, 0xbb, 0xce, 0x28, 0x0d, 0xfa, 0x35, 0x61, 0xdb, + 0x90, 0x92, 0xdf, 0xa4, 0x01, 0xda, 0x84, 0x6e, 0x88, 0x2f, 0x9d, 0x8b, 0x38, 0x18, 0x85, 0xc4, + 0x71, 0xe3, 0x51, 0xc4, 0xfa, 0x73, 0x62, 0x7a, 0x3b, 0xc4, 0x97, 0xaf, 0x84, 0x78, 0x97, 0x4b, + 0xd1, 0x06, 0x8f, 0xea, 0xd2, 0x39, 0xf5, 0x03, 0xe2, 0x9c, 0x93, 0x71, 0x7f, 0x7e, 0xa3, 0xb2, + 0x39, 0x67, 0x43, 0x88, 0x2f, 0xbf, 0xf0, 0x03, 0xf2, 0x9c, 0x8c, 0xd1, 0x3a, 0x34, 0x3d, 0xcc, + 0xb0, 0xe3, 0x92, 0x88, 0x91, 0xb4, 0xbf, 0x20, 0xd6, 0x02, 0x2e, 0xda, 0x15, 0x12, 0x1e, 0x5f, + 0x8a, 0xdd, 0xf3, 0xfe, 0xa2, 0xd0, 0x88, 0x67, 0x1e, 0x1f, 0xf6, 0x42, 0x3f, 0x72, 0x44, 0xe4, + 0x75, 0xb1, 0x74, 0x43, 0x48, 0x5e, 0xf0, 0xf0, 0x3f, 0x83, 0x45, 0x19, 0x1b, 0xed, 0x37, 0x36, + 0x6a, 0x9b, 0xcd, 0xed, 0x77, 0xb6, 0x32, 0x34, 0xb6, 0x64, 0x78, 0xfb, 0xd1, 0x69, 0x9c, 0x86, + 0x98, 0xf9, 0x71, 0x74, 0x48, 0x28, 0xc5, 0x67, 0xc4, 0xd6, 0x73, 0xd0, 0x3e, 0x34, 0x23, 0xf2, + 0xc6, 0xd1, 0x2e, 0x40, 0xb8, 0xd8, 0x9c, 0x70, 0x71, 0xfc, 0x3a, 0x4e, 0xd9, 0x14, 0x3f, 0x10, + 0x91, 0x37, 0xaf, 0x94, 0xab, 0x97, 0xd0, 0xf1, 0x48, 0x40, 0x18, 0xf1, 0x32, 0x77, 0xcd, 0x1b, + 0xba, 0x6b, 0x2b, 0x07, 0xda, 0xe5, 0xbb, 0xd0, 0x7e, 0x8d, 0xa9, 0x13, 0xc5, 0x99, 0xc7, 0xa5, + 0x8d, 0xca, 0x66, 0xdd, 0x5e, 0x7a, 0x8d, 0xe9, 0x51, 0xac, 0xad, 0x9e, 0x41, 0x83, 0xb8, 0x0e, + 0x7d, 0x8d, 0x53, 0x8f, 0xf6, 0xbb, 0x62, 0xc9, 0xc7, 0x13, 0x4b, 0xee, 0xb9, 0xc7, 0xdc, 0x60, + 0xca, 0xa2, 0x75, 0x22, 0x55, 0x14, 0x1d, 0x41, 0x8b, 0x83, 0x91, 0x3b, 0xeb, 0xdd, 0xd8, 0x19, + 0x47, 0x73, 0x4f, 0xfb, 0x7b, 0x05, 0x3d, 0x8d, 0x48, 0xee, 0x13, 0xdd, 0xd8, 0xa7, 0x86, 0x35, + 0xf3, 0xfb, 0x3e, 0x74, 0x15, 0x2c, 0xb9, 0xdb, 0x65, 0x01, 0x4c, 0x4b, 0x00, 0xa3, 0x0d, 0xad, + 0x3f, 0x54, 0xa1, 0x97, 0x9d, 0x06, 0x9b, 0xd0, 0x24, 0x8e, 0x28, 0x41, 0x8f, 0xa1, 0xa7, 0xb6, + 0x33, 0xf5, 0xbf, 0x25, 0x4e, 0xe0, 0x87, 0x3e, 0x13, 0x87, 0x64, 0xce, 0xee, 0x48, 0xc5, 0xb1, + 0xff, 0x2d, 0x39, 0xe0, 0x62, 0xb4, 0x0a, 0x0b, 0x01, 0xc1, 0x1e, 0x49, 0xc5, 0x99, 0x69, 0xd8, + 0x6a, 0x84, 0xde, 0x87, 0x4e, 0x48, 0x58, 0xea, 0xbb, 0xd4, 0xc1, 0x9e, 0x97, 0x12, 0x4a, 0xd5, + 0xd1, 0x69, 0x2b, 0xf1, 0x8e, 0x94, 0xa2, 0x4f, 0xa0, 0xaf, 0x0d, 0x7d, 0xbe, 0xc7, 0x2f, 0x70, + 0xe0, 0x50, 0xe2, 0xc6, 0x91, 0x47, 0xd5, 0x39, 0x5a, 0x55, 0xfa, 0x7d, 0xa5, 0x3e, 0x96, 0x5a, + 0xf4, 0x14, 0xba, 0x94, 0xc5, 0x29, 0x3e, 0x23, 0xce, 0x10, 0xbb, 0xe7, 0x84, 0xcf, 0x98, 0x17, + 0xe0, 0xad, 0x19, 0xe0, 0x1d, 0x4b, 0x93, 0x27, 0xd2, 0xc2, 0xee, 0xd0, 0xc2, 0x98, 0x5a, 0xdf, + 0xd7, 0xa0, 0x3f, 0xeb, 0x18, 0x88, 0xfa, 0xe0, 0x89, 0x57, 0x6f, 0xd9, 0x55, 0xdf, 0xe3, 0xe7, + 0x8f, 0x43, 0x22, 0xde, 0x75, 0xce, 0x16, 0xcf, 0xe8, 0x01, 0x80, 0x1b, 0x07, 0x01, 0x71, 0xf9, + 0x44, 0xf5, 0x92, 0x86, 0x84, 0x9f, 0x4f, 0x71, 0xe4, 0xf3, 0xd2, 0x30, 0x67, 0x37, 0xb8, 0x44, + 0x56, 0x85, 0x87, 0xb0, 0x24, 0xd3, 0xa7, 0x0c, 0x64, 0x55, 0x68, 0x4a, 0x99, 0x34, 0xf9, 0x00, + 0x90, 0xde, 0x26, 0xc3, 0x71, 0x66, 0xb8, 0x20, 0x0c, 0xbb, 0x4a, 0xf3, 0x64, 0xac, 0xad, 0xef, + 0x42, 0x23, 0x25, 0xd8, 0x73, 0xe2, 0x28, 0x18, 0x8b, 0x42, 0x51, 0xb7, 0xeb, 0x5c, 0xf0, 0x65, + 0x14, 0x8c, 0xd1, 0xff, 0x41, 0x2f, 0x25, 0x49, 0xe0, 0xbb, 0xd8, 0x49, 0x02, 0xec, 0x92, 0x90, + 0x44, 0xba, 0x66, 0x74, 0x95, 0xe2, 0x85, 0x96, 0xa3, 0x3e, 0x2c, 0x5e, 0x90, 0x94, 0xf2, 0xd7, + 0x6a, 0x08, 0x13, 0x3d, 0x44, 0x5d, 0xa8, 0x31, 0x16, 0xf4, 0x41, 0x48, 0xf9, 0x23, 0x7a, 0x04, + 0x5d, 0x37, 0x0e, 0x13, 0xec, 0x32, 0x27, 0x25, 0x17, 0xbe, 0x98, 0xd4, 0x14, 0xea, 0x8e, 0x92, + 0xdb, 0x4a, 0xcc, 0x5f, 0x27, 0x8c, 0x3d, 0xff, 0xd4, 0x27, 0x9e, 0x83, 0x99, 0x4a, 0xb6, 0x38, + 0xb8, 0x35, 0xbb, 0xab, 0x35, 0x3b, 0x4c, 0xa6, 0x19, 0x6d, 0xc1, 0x72, 0x4a, 0xc2, 0x98, 0x11, + 0x47, 0x27, 0x3b, 0xc2, 0x21, 0xe9, 0xb7, 0x04, 0xce, 0x3d, 0xa9, 0x52, 0x39, 0x3e, 0xc2, 0x21, + 0xe1, 0xde, 0x4b, 0xf6, 0xbc, 0xd6, 0xb6, 0x85, 0x79, 0xb7, 0x60, 0xfe, 0x9c, 0x8c, 0xad, 0xbf, + 0x55, 0xe0, 0xfe, 0x95, 0x25, 0x67, 0x62, 0x0b, 0x5c, 0x97, 0xee, 0x9f, 0x0a, 0x61, 0x6b, 0x04, + 0xeb, 0xd7, 0x14, 0x82, 0x6b, 0x62, 0xad, 0x4e, 0xc4, 0x6a, 0x41, 0x8b, 0xb8, 0x8e, 0x1f, 0x79, + 0xe4, 0xd2, 0x19, 0xfa, 0x4c, 0x1e, 0xd1, 0x96, 0xdd, 0x24, 0xee, 0x3e, 0x97, 0x3d, 0xf1, 0x19, + 0xb5, 0xbe, 0xab, 0x40, 0xbb, 0x78, 0x86, 0xf8, 0x29, 0x60, 0xe3, 0x84, 0xa8, 0xbe, 0x29, 0x9e, + 0xd5, 0xd2, 0x55, 0xd5, 0x49, 0x3d, 0xb4, 0x0f, 0x90, 0xa4, 0x71, 0x42, 0x52, 0xe6, 0x13, 0xee, + 0x97, 0x1f, 0xcb, 0x47, 0x33, 0x8f, 0xe5, 0xd6, 0x8b, 0xcc, 0x76, 0x2f, 0x62, 0xe9, 0xd8, 0x36, + 0x26, 0x0f, 0x3e, 0x83, 0x4e, 0x49, 0xcd, 0xd1, 0xe1, 0x59, 0x95, 0x01, 0xf0, 0x47, 0xb4, 0x02, + 0xf3, 0x17, 0x38, 0x18, 0x11, 0x15, 0x82, 0x1c, 0xfc, 0xb2, 0xfa, 0x49, 0xc5, 0x5a, 0x84, 0xf9, + 0xbd, 0x30, 0x61, 0x63, 0xfe, 0x26, 0x9d, 0xe3, 0x51, 0x42, 0xd2, 0x27, 0x41, 0xec, 0x9e, 0xef, + 0x5d, 0xb2, 0x14, 0xa3, 0x2f, 0xa1, 0x4d, 0x52, 0x4c, 0x47, 0x29, 0x3f, 0x55, 0x9e, 0x1f, 0x9d, + 0x09, 0x9f, 0xc5, 0x96, 0x54, 0x9a, 0xb3, 0xb5, 0x27, 0x27, 0xec, 0x0a, 0x7b, 0xbb, 0x45, 0xcc, + 0xe1, 0xe0, 0x6b, 0x68, 0x15, 0xf4, 0x1c, 0x2c, 0xde, 0xc0, 0x55, 0x56, 0xc4, 0x33, 0x2f, 0x9a, + 0x09, 0x4e, 0x7d, 0x36, 0x56, 0x44, 0x43, 0x8d, 0x78, 0xa9, 0x50, 0x85, 0xd7, 0xf7, 0x24, 0x68, + 0x2d, 0xbb, 0x21, 0x25, 0xfb, 0x1e, 0xb5, 0x9e, 0xc1, 0xca, 0x73, 0x42, 0x92, 0xdd, 0x38, 0x8a, + 0x88, 0xcb, 0x88, 0x67, 0x93, 0xdf, 0x8d, 0x08, 0x65, 0x7c, 0x09, 0x71, 0x26, 0x54, 0x3e, 0xf8, + 0x33, 0xaf, 0x02, 0x67, 0x69, 0xe2, 0x3a, 0x06, 0x9d, 0xa9, 0x73, 0x01, 0xe7, 0x04, 0xd6, 0x5f, + 0x2b, 0xd0, 0x96, 0x7b, 0xe9, 0x20, 0x76, 0xc5, 0x0e, 0xe2, 0x88, 0x72, 0x7a, 0xa3, 0x10, 0x1d, + 0xa5, 0x41, 0x89, 0xf7, 0x54, 0xcb, 0xbc, 0x67, 0x0d, 0xea, 0x82, 0x18, 0xe4, 0x91, 0x2e, 0xf2, + 0x5e, 0xef, 0x7b, 0x34, 0x2f, 0x69, 0x9e, 0x54, 0xcf, 0x09, 0x75, 0x53, 0xf7, 0x6e, 0x6e, 0x92, + 0xb7, 0x8d, 0x79, 0xb3, 0x6d, 0x58, 0x27, 0xb0, 0x7c, 0x10, 0xc7, 0xe7, 0xa3, 0x44, 0x86, 0xa7, + 0xdf, 0xb0, 0x08, 0x4c, 0x65, 0xa3, 0xc6, 0x63, 0xc9, 0x80, 0xb9, 0x6e, 0x9f, 0x5b, 0xff, 0xae, + 0xc0, 0x4a, 0xd1, 0xad, 0xea, 0x74, 0xdf, 0xc0, 0x72, 0xe6, 0xd7, 0x09, 0x14, 0x16, 0x72, 0x81, + 0xe6, 0xf6, 0x87, 0xc6, 0x1e, 0x98, 0x36, 0x5b, 0xb3, 0x27, 0x4f, 0x83, 0x68, 0xf7, 0x2e, 0x4a, + 0x12, 0x3a, 0xb8, 0x84, 0x6e, 0xd9, 0x8c, 0xe7, 0x26, 0x5b, 0x55, 0x21, 0x5e, 0xd7, 0x33, 0xd1, + 0xcf, 0xa1, 0x91, 0x07, 0x52, 0x15, 0x81, 0x2c, 0x17, 0x02, 0x51, 0x6b, 0xe5, 0x56, 0x7c, 0xef, + 0x93, 0x34, 0x8d, 0x53, 0x55, 0x8d, 0xe4, 0xc0, 0xfa, 0x14, 0xea, 0x3f, 0x3a, 0xbb, 0xd6, 0x3f, + 0xaa, 0xd0, 0xda, 0xa1, 0xd4, 0x3f, 0x8b, 0x74, 0x0a, 0x56, 0x60, 0x5e, 0xf6, 0x1d, 0x49, 0x04, + 0xe4, 0x00, 0x6d, 0x40, 0x53, 0x15, 0x35, 0x03, 0x7a, 0x53, 0x74, 0x6d, 0xbd, 0x54, 0x85, 0x6e, + 0x4e, 0x86, 0xc6, 0x5b, 0x49, 0x89, 0x05, 0xcf, 0xcf, 0x64, 0xc1, 0x0b, 0x06, 0x0b, 0xbe, 0x0b, + 0x0d, 0x31, 0x29, 0x8a, 0x3d, 0xa2, 0xe8, 0x71, 0x9d, 0x0b, 0x8e, 0x62, 0x8f, 0xa0, 0x6d, 0x58, + 0x0d, 0x49, 0x18, 0xa7, 0x63, 0x27, 0xc4, 0x89, 0xc3, 0x49, 0xb8, 0x20, 0x36, 0xe1, 0x50, 0x15, + 0x66, 0x24, 0xb5, 0x87, 0x38, 0x39, 0xc4, 0x97, 0x9c, 0xdb, 0x1c, 0x0e, 0xd1, 0x36, 0xdc, 0xfe, + 0x2a, 0xf5, 0x19, 0x1e, 0x06, 0xa4, 0x48, 0xee, 0x65, 0xa1, 0x5e, 0xd6, 0x4a, 0x83, 0xe1, 0x5b, + 0x7f, 0xa9, 0x40, 0x5b, 0xa3, 0xa6, 0x76, 0x58, 0x17, 0x6a, 0xa7, 0x59, 0x96, 0xf9, 0xa3, 0xce, + 0x45, 0x75, 0x56, 0x2e, 0x26, 0x6e, 0x18, 0x19, 0xf2, 0x73, 0x26, 0xf2, 0x59, 0xd2, 0xe7, 0x8d, + 0xa4, 0x73, 0x68, 0xf0, 0x88, 0xbd, 0xd6, 0xd0, 0xf0, 0x67, 0xeb, 0x0c, 0x7a, 0xc7, 0x0c, 0x33, + 0x9f, 0x32, 0xdf, 0xa5, 0x3a, 0x9d, 0xa5, 0xc4, 0x55, 0xae, 0x4b, 0x5c, 0x75, 0x56, 0xe2, 0x6a, + 0x59, 0xe2, 0xac, 0x7f, 0x55, 0x00, 0x99, 0x2b, 0x29, 0x08, 0x7e, 0x82, 0xa5, 0x38, 0x64, 0x2c, + 0x66, 0x9c, 0x2a, 0x72, 0x3a, 0xa6, 0x48, 0x95, 0x90, 0xf0, 0xf4, 0xf1, 0xdd, 0x30, 0xa2, 0xc4, + 0x93, 0x5a, 0xc9, 0xa8, 0xea, 0x5c, 0x20, 0x94, 0x45, 0x42, 0xb6, 0x50, 0x22, 0x64, 0xd6, 0x0e, + 0x34, 0x55, 0x73, 0x3a, 0xe1, 0x8d, 0xed, 0xfa, 0xe8, 0x55, 0x74, 0xd5, 0x1c, 0x88, 0x0d, 0x80, + 0xdd, 0x3c, 0xfa, 0x29, 0xe5, 0xd9, 0xfa, 0x3d, 0xdc, 0xce, 0x2d, 0x0e, 0x7c, 0xca, 0x74, 0x5e, + 0x3e, 0x86, 0x55, 0x3f, 0x72, 0x83, 0x91, 0x47, 0x9c, 0x88, 0xb7, 0xf7, 0x20, 0xbb, 0xd9, 0x54, + 0x04, 0x95, 0x5b, 0x51, 0xda, 0x23, 0xa1, 0xd4, 0x37, 0x9c, 0x0f, 0x00, 0xe9, 0x59, 0xc4, 0xcd, + 0x66, 0x54, 0xc5, 0x8c, 0xae, 0xd2, 0xec, 0xb9, 0xca, 0xda, 0x7a, 0x09, 0xab, 0xe5, 0xc5, 0x55, + 0xaa, 0x7e, 0x01, 0xcd, 0x1c, 0x76, 0x5d, 0x07, 0x6f, 0x1b, 0xe5, 0x27, 0x9f, 0x67, 0x9b, 0x96, + 0xd6, 0xff, 0xc3, 0x9d, 0x5c, 0xf5, 0x54, 0x14, 0xfa, 0x2b, 0xba, 0x93, 0x35, 0x80, 0xfe, 0xa4, + 0xb9, 0x8c, 0xc1, 0xfa, 0x73, 0x0d, 0x96, 0x9e, 0xaa, 0x93, 0xcb, 0x39, 0x8e, 0xc1, 0x6a, 0x24, + 0xb5, 0x78, 0x08, 0x4b, 0x85, 0x03, 0x29, 0xc9, 0x78, 0xf3, 0xc2, 0xb8, 0x6a, 0x4f, 0xbb, 0x94, + 0xd7, 0x84, 0x59, 0xf9, 0x52, 0xfe, 0x18, 0x7a, 0xa7, 0x29, 0x21, 0x93, 0xf7, 0xf7, 0x39, 0xbb, + 0xc3, 0x15, 0xa6, 0xed, 0x16, 0x2c, 0x63, 0x97, 0xf9, 0x17, 0x25, 0x6b, 0xb9, 0xbf, 0x7a, 0x52, + 0x65, 0xda, 0x7f, 0x91, 0x05, 0xea, 0x47, 0xa7, 0x31, 0xed, 0x2f, 0xfc, 0xf0, 0xfb, 0xb7, 0x7a, + 0x1b, 0xae, 0xa1, 0xe8, 0x05, 0xb4, 0xf5, 0x3d, 0x4e, 0x79, 0x5a, 0xbc, 0xf1, 0x1d, 0x71, 0x89, + 0xe4, 0x2a, 0x6a, 0x90, 0xea, 0xc2, 0x9b, 0xd4, 0xe5, 0x9b, 0x48, 0x95, 0x59, 0xd8, 0xfe, 0x59, + 0x85, 0xba, 0x8d, 0xdd, 0xf3, 0xb7, 0x3b, 0x1f, 0x9f, 0x43, 0x27, 0xeb, 0x11, 0x85, 0x94, 0xdc, + 0x31, 0x80, 0x34, 0xb7, 0x9e, 0xdd, 0xf2, 0x8c, 0xd1, 0x4c, 0xd8, 0x16, 0x67, 0xc1, 0xf6, 0xf7, + 0x2a, 0xb4, 0x9f, 0x66, 0x7d, 0xeb, 0xed, 0x06, 0x6f, 0x1b, 0x80, 0x37, 0xda, 0x02, 0x6e, 0x26, + 0x31, 0xd1, 0xdb, 0xc3, 0x6e, 0xa4, 0xea, 0xe9, 0xe6, 0x78, 0x7d, 0x57, 0x85, 0xa5, 0x93, 0x38, + 0x89, 0x83, 0xf8, 0x6c, 0xfc, 0x76, 0xa3, 0xb5, 0x07, 0x3d, 0x83, 0xc3, 0x14, 0x40, 0x5b, 0x2b, + 0x6d, 0xb6, 0x7c, 0x73, 0xd8, 0x1d, 0xaf, 0x30, 0xbe, 0x39, 0x80, 0xcb, 0xd0, 0x53, 0xbc, 0x3e, + 0x6f, 0x29, 0xd6, 0x1f, 0x2b, 0x80, 0x4c, 0xa9, 0xaa, 0xf5, 0xbf, 0x82, 0x16, 0x53, 0x58, 0x8b, + 0xf8, 0xd4, 0xcd, 0xc7, 0x3c, 0x0b, 0x66, 0x2e, 0xec, 0x25, 0x66, 0x66, 0xe6, 0x67, 0xb0, 0x32, + 0xf1, 0x8d, 0x88, 0x13, 0x2a, 0x99, 0x91, 0x5e, 0xe9, 0x33, 0xd1, 0xe1, 0xd0, 0xfa, 0x18, 0x6e, + 0x4b, 0x12, 0xad, 0xfb, 0x90, 0xee, 0x0f, 0x13, 0x6c, 0xb8, 0x95, 0xb3, 0x61, 0xeb, 0xfb, 0x0a, + 0xac, 0x96, 0xa7, 0xa9, 0xf8, 0xaf, 0x9a, 0x87, 0x30, 0x20, 0x55, 0x2f, 0x4d, 0x5e, 0x2f, 0xe9, + 0xf4, 0x47, 0x13, 0xbc, 0xbe, 0xec, 0x7b, 0x4b, 0xd7, 0xd1, 0x9c, 0xda, 0x77, 0x69, 0x51, 0x40, + 0x07, 0x18, 0x7a, 0x13, 0x66, 0xfc, 0x56, 0xa4, 0xd7, 0x55, 0x31, 0x2d, 0xaa, 0x89, 0x3f, 0x82, + 0xd8, 0x5b, 0xeb, 0x70, 0xff, 0x19, 0x61, 0x87, 0xc2, 0x66, 0x37, 0x8e, 0x4e, 0xfd, 0xb3, 0x51, + 0x2a, 0x8d, 0xf2, 0xd4, 0x3e, 0x98, 0x65, 0xa1, 0x60, 0x9a, 0xf2, 0x21, 0xae, 0x72, 0xe3, 0x0f, + 0x71, 0xd5, 0xab, 0x3e, 0xc4, 0x59, 0x9f, 0x42, 0x9f, 0xef, 0x2c, 0x15, 0x45, 0xe0, 0x93, 0x88, + 0x65, 0x3c, 0x73, 0x1d, 0x9a, 0xae, 0x90, 0x38, 0xc6, 0x27, 0x03, 0x90, 0x22, 0xce, 0xaf, 0xac, + 0x27, 0xb0, 0x36, 0x65, 0xb2, 0x0a, 0xfe, 0x3d, 0x68, 0x8b, 0x5b, 0xac, 0x8a, 0x9c, 0xe8, 0xbb, + 0x5f, 0x8b, 0x4b, 0x77, 0xb4, 0xd0, 0x0a, 0x61, 0xf5, 0x80, 0x60, 0x4a, 0x76, 0xbc, 0xd0, 0x8f, + 0x4e, 0xe2, 0x73, 0x92, 0xdd, 0x5a, 0xde, 0x83, 0x76, 0x92, 0x92, 0x0b, 0x3f, 0x1e, 0x51, 0x87, + 0x71, 0x85, 0x88, 0xa0, 0x66, 0xb7, 0xb4, 0x54, 0x58, 0x73, 0xfe, 0x94, 0x99, 0xf1, 0x8b, 0xbe, + 0xc3, 0xfc, 0x50, 0x7e, 0x4a, 0xa8, 0xd9, 0x5d, 0xad, 0x39, 0x88, 0xdd, 0xf3, 0x13, 0x3f, 0x24, + 0xd6, 0x21, 0xdc, 0x99, 0x58, 0x4e, 0x05, 0xbc, 0x02, 0xf3, 0xe6, 0x32, 0x72, 0x80, 0xee, 0x01, + 0x48, 0xaf, 0xd4, 0x89, 0xa8, 0x72, 0x5b, 0xe7, 0x92, 0x13, 0x7a, 0x44, 0xad, 0x18, 0xfa, 0x36, + 0x09, 0xfe, 0x87, 0xf1, 0xdf, 0x85, 0xb5, 0x29, 0x0b, 0xca, 0x37, 0xd8, 0xfe, 0x4f, 0x1d, 0x16, + 0x8f, 0x09, 0x7e, 0x43, 0x88, 0x87, 0xf6, 0xa1, 0x75, 0x4c, 0x22, 0x2f, 0xff, 0x5f, 0xb2, 0x62, + 0x6c, 0xd8, 0x4c, 0x3a, 0xb8, 0x37, 0x4d, 0x9a, 0xf1, 0xb9, 0x5b, 0x9b, 0x95, 0x0f, 0x2b, 0xe8, + 0x25, 0xb4, 0x0a, 0xdf, 0x2e, 0xd0, 0xba, 0x31, 0x69, 0xda, 0x57, 0x8d, 0xc1, 0xda, 0x04, 0xbb, + 0xd1, 0x47, 0x24, 0x73, 0xb9, 0x64, 0x5e, 0xcb, 0xd1, 0x83, 0x99, 0xf7, 0x75, 0xe9, 0x70, 0xfd, + 0x9a, 0xfb, 0xbc, 0x75, 0x0b, 0x7d, 0x0e, 0x0b, 0xf2, 0xfe, 0x86, 0xfa, 0x86, 0x71, 0xe1, 0x22, + 0x5c, 0x88, 0xab, 0x78, 0xd9, 0xb3, 0x6e, 0xa1, 0xe7, 0x00, 0xf9, 0x0d, 0x08, 0xdd, 0x2b, 0x7c, + 0xf0, 0x2a, 0x5d, 0xc1, 0x06, 0xf7, 0x67, 0x68, 0x33, 0x67, 0x5f, 0x41, 0xbb, 0xc8, 0xd3, 0xd1, + 0xc6, 0x54, 0x2a, 0x6e, 0x14, 0xfb, 0xc1, 0xc3, 0x2b, 0x2c, 0x32, 0xc7, 0xbf, 0x85, 0x6e, 0x99, + 0x7e, 0x23, 0x6b, 0xea, 0xc4, 0x02, 0x95, 0x1f, 0xbc, 0x73, 0xa5, 0x8d, 0x09, 0x42, 0xde, 0x6f, + 0x0a, 0x20, 0x4c, 0x34, 0xa7, 0x02, 0x08, 0x93, 0x4d, 0x4a, 0x82, 0x50, 0x2c, 0xd2, 0x05, 0x10, + 0xa6, 0xb6, 0x94, 0x02, 0x08, 0xd3, 0x2b, 0xbc, 0x75, 0x0b, 0xc5, 0xb0, 0x3a, 0xbd, 0x74, 0x22, + 0xf3, 0xe3, 0xdf, 0x95, 0xf5, 0x77, 0xf0, 0xe8, 0x07, 0x58, 0x66, 0x0b, 0x7e, 0x03, 0xbd, 0x89, + 0x4a, 0x87, 0x4c, 0x48, 0x67, 0x15, 0xd1, 0xc1, 0xbb, 0x57, 0x1b, 0x65, 0x2b, 0x7c, 0x0d, 0x9d, + 0x52, 0x61, 0x42, 0x05, 0x28, 0xa6, 0xd6, 0x98, 0x81, 0x75, 0x95, 0x89, 0x19, 0xfd, 0x44, 0xd1, + 0x28, 0x44, 0x3f, 0xab, 0x86, 0x15, 0xa2, 0x9f, 0x59, 0x77, 0xac, 0x5b, 0xc3, 0x05, 0xf1, 0xb3, + 0xf6, 0xa3, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x9c, 0x7a, 0x09, 0x55, 0xbc, 0x1d, 0x00, 0x00, } diff --git a/weed/server/master_grpc_server_admin.go b/weed/server/master_grpc_server_admin.go index 8cc04f575..b986a93a2 100644 --- a/weed/server/master_grpc_server_admin.go +++ b/weed/server/master_grpc_server_admin.go @@ -18,8 +18,6 @@ Shell When shell lock, * lease an admin token (lockTime, token) * start a goroutine to renew the admin token periodically -For later volume operations, send (lockTime, token) to volume servers for exclusive access - * need to pause renewal a few seconds, to prevent race condition When shell unlock * stop the renewal goroutine @@ -48,13 +46,9 @@ When master receives the lease/renew request from shell When master receives the release lock request from shell set the lastLockTime to zero -When master receives the verfication request from volume servers - return secret+lockTime == token && lockTime == lastLockTime - -Volume ------- -When receives (lockTime, token), ask the master whether this is valid +The volume server does not need to verify. +This makes the lock/unlock optional, similar to what golang code usually does. */ @@ -97,11 +91,3 @@ func (ms *MasterServer) ReleaseAdminToken(ctx context.Context, req *master_pb.Re } return resp, nil } - -func (ms *MasterServer) VerifyAdminToken(ctx context.Context, req *master_pb.VerifyAdminTokenRequest) (*master_pb.VerifyAdminTokenResponse, error) { - resp := &master_pb.VerifyAdminTokenResponse{} - if ms.isValidToken(time.Unix(0, req.LockTime), req.Token) { - resp.IsValid = true - } - return resp, nil -}