From 30ee4f3291d5f94d6d41f54915b8c3860bf0c05e Mon Sep 17 00:00:00 2001 From: Chris Lu Date: Thu, 23 Apr 2020 02:31:04 -0700 Subject: [PATCH] add exclusive lock library on shell --- weed/pb/master.proto | 6 +- weed/pb/master_pb/master.pb.go | 326 +++++++++++------------- weed/server/master_grpc_server_admin.go | 4 +- weed/shell/commands.go | 5 +- weed/shell/exclusive_locker.go | 95 +++++++ 5 files changed, 257 insertions(+), 179 deletions(-) create mode 100644 weed/shell/exclusive_locker.go diff --git a/weed/pb/master.proto b/weed/pb/master.proto index 3e9e3ba41..29fd9d0e2 100644 --- a/weed/pb/master.proto +++ b/weed/pb/master.proto @@ -287,10 +287,8 @@ message LeaseAdminTokenRequest { int64 previous_lock_time = 2; } message LeaseAdminTokenResponse { - bool is_allowed = 1; - string error = 2; - int64 lock_ts_ns = 3; - int64 token = 4; + int64 token = 1; + int64 lock_ts_ns = 2; } message ReleaseAdminTokenRequest { diff --git a/weed/pb/master_pb/master.pb.go b/weed/pb/master_pb/master.pb.go index b3fcf531a..727cce157 100644 --- a/weed/pb/master_pb/master.pb.go +++ b/weed/pb/master_pb/master.pb.go @@ -1504,10 +1504,8 @@ func (m *LeaseAdminTokenRequest) GetPreviousLockTime() int64 { } type LeaseAdminTokenResponse struct { - IsAllowed bool `protobuf:"varint,1,opt,name=is_allowed,json=isAllowed" json:"is_allowed,omitempty"` - Error string `protobuf:"bytes,2,opt,name=error" json:"error,omitempty"` - LockTsNs int64 `protobuf:"varint,3,opt,name=lock_ts_ns,json=lockTsNs" json:"lock_ts_ns,omitempty"` - Token int64 `protobuf:"varint,4,opt,name=token" json:"token,omitempty"` + Token int64 `protobuf:"varint,1,opt,name=token" json:"token,omitempty"` + LockTsNs int64 `protobuf:"varint,2,opt,name=lock_ts_ns,json=lockTsNs" json:"lock_ts_ns,omitempty"` } func (m *LeaseAdminTokenResponse) Reset() { *m = LeaseAdminTokenResponse{} } @@ -1515,18 +1513,11 @@ func (m *LeaseAdminTokenResponse) String() string { return proto.Comp func (*LeaseAdminTokenResponse) ProtoMessage() {} func (*LeaseAdminTokenResponse) Descriptor() ([]byte, []int) { return fileDescriptor0, []int{36} } -func (m *LeaseAdminTokenResponse) GetIsAllowed() bool { +func (m *LeaseAdminTokenResponse) GetToken() int64 { if m != nil { - return m.IsAllowed + return m.Token } - return false -} - -func (m *LeaseAdminTokenResponse) GetError() string { - if m != nil { - return m.Error - } - return "" + return 0 } func (m *LeaseAdminTokenResponse) GetLockTsNs() int64 { @@ -1536,13 +1527,6 @@ func (m *LeaseAdminTokenResponse) GetLockTsNs() int64 { return 0 } -func (m *LeaseAdminTokenResponse) GetToken() int64 { - if m != nil { - return m.Token - } - return 0 -} - type ReleaseAdminTokenRequest struct { PreviousToken int64 `protobuf:"varint,1,opt,name=previous_token,json=previousToken" json:"previous_token,omitempty"` PreviousLockTime int64 `protobuf:"varint,2,opt,name=previous_lock_time,json=previousLockTime" json:"previous_lock_time,omitempty"` @@ -2231,156 +2215,154 @@ var _Seaweed_serviceDesc = grpc.ServiceDesc{ func init() { proto.RegisterFile("master.proto", fileDescriptor0) } var fileDescriptor0 = []byte{ - // 2409 bytes of a gzipped FileDescriptorProto + // 2380 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xd4, 0x59, 0x4b, 0x6f, 0x1c, 0xc7, - 0xf1, 0xd7, 0xec, 0xf2, 0xb1, 0x5b, 0xcb, 0x5d, 0xee, 0x36, 0x29, 0x6a, 0xb9, 0x96, 0x44, 0x6a, - 0x6c, 0xc3, 0x94, 0xfe, 0xfe, 0x33, 0x0e, 0xed, 0x20, 0x46, 0x1c, 0xc3, 0xa0, 0x28, 0x5a, 0x21, - 0x44, 0xd2, 0xd2, 0x90, 0x91, 0x01, 0x03, 0xc1, 0xb8, 0x39, 0xd3, 0xa4, 0x1a, 0x9c, 0x57, 0xa6, - 0x7b, 0x29, 0xae, 0x73, 0x09, 0x92, 0x63, 0x4e, 0x41, 0x0e, 0xf9, 0x0a, 0xb9, 0xe4, 0x94, 0x9c, - 0x7d, 0xc9, 0x77, 0xc8, 0x07, 0xc9, 0xd5, 0x97, 0xa0, 0x1f, 0x33, 0xd3, 0x33, 0xbb, 0x4b, 0x9a, - 0x06, 0x1c, 0x40, 0xb7, 0xe9, 0xaa, 0xea, 0xea, 0xea, 0x5f, 0x75, 0xd7, 0xa3, 0x07, 0x16, 0x42, - 0xcc, 0x38, 0x49, 0x37, 0x93, 0x34, 0xe6, 0x31, 0x6a, 0xaa, 0x91, 0x9b, 0x9c, 0xd8, 0x7f, 0x9a, - 0x83, 0xe6, 0xaf, 0x08, 0x4e, 0xf9, 0x09, 0xc1, 0x1c, 0x75, 0xa0, 0x46, 0x93, 0xbe, 0xb5, 0x6e, - 0x6d, 0x34, 0x9d, 0x1a, 0x4d, 0x10, 0x82, 0x99, 0x24, 0x4e, 0x79, 0xbf, 0xb6, 0x6e, 0x6d, 0xb4, - 0x1d, 0xf9, 0x8d, 0xee, 0x01, 0x24, 0xc3, 0x93, 0x80, 0x7a, 0xee, 0x30, 0x0d, 0xfa, 0x75, 0x29, - 0xdb, 0x54, 0x94, 0x5f, 0xa7, 0x01, 0xda, 0x80, 0x6e, 0x88, 0x2f, 0xdd, 0x8b, 0x38, 0x18, 0x86, - 0xc4, 0xf5, 0xe2, 0x61, 0xc4, 0xfb, 0x33, 0x72, 0x7a, 0x27, 0xc4, 0x97, 0x2f, 0x25, 0x79, 0x47, - 0x50, 0xd1, 0xba, 0xb0, 0xea, 0xd2, 0x3d, 0xa5, 0x01, 0x71, 0xcf, 0xc9, 0xa8, 0x3f, 0xbb, 0x6e, - 0x6d, 0xcc, 0x38, 0x10, 0xe2, 0xcb, 0xcf, 0x69, 0x40, 0x9e, 0x91, 0x11, 0x5a, 0x83, 0x96, 0x8f, - 0x39, 0x76, 0x3d, 0x12, 0x71, 0x92, 0xf6, 0xe7, 0xe4, 0x5a, 0x20, 0x48, 0x3b, 0x92, 0x22, 0xec, - 0x4b, 0xb1, 0x77, 0xde, 0x9f, 0x97, 0x1c, 0xf9, 0x2d, 0xec, 0xc3, 0x7e, 0x48, 0x23, 0x57, 0x5a, - 0xde, 0x90, 0x4b, 0x37, 0x25, 0xe5, 0xb9, 0x30, 0xff, 0x53, 0x98, 0x57, 0xb6, 0xb1, 0x7e, 0x73, - 0xbd, 0xbe, 0xd1, 0xda, 0x7a, 0x7b, 0x33, 0x47, 0x63, 0x53, 0x99, 0xb7, 0x17, 0x9d, 0xc6, 0x69, - 0x88, 0x39, 0x8d, 0xa3, 0x03, 0xc2, 0x18, 0x3e, 0x23, 0x4e, 0x36, 0x07, 0xed, 0x41, 0x2b, 0x22, - 0xaf, 0xdd, 0x4c, 0x05, 0x48, 0x15, 0x1b, 0x63, 0x2a, 0x8e, 0x5e, 0xc5, 0x29, 0x9f, 0xa0, 0x07, - 0x22, 0xf2, 0xfa, 0xa5, 0x56, 0xf5, 0x02, 0x16, 0x7d, 0x12, 0x10, 0x4e, 0xfc, 0x5c, 0x5d, 0xeb, - 0x86, 0xea, 0x3a, 0x5a, 0x41, 0xa6, 0xf2, 0x1d, 0xe8, 0xbc, 0xc2, 0xcc, 0x8d, 0xe2, 0x5c, 0xe3, - 0xc2, 0xba, 0xb5, 0xd1, 0x70, 0x16, 0x5e, 0x61, 0x76, 0x18, 0x67, 0x52, 0x4f, 0xa1, 0x49, 0x3c, - 0x97, 0xbd, 0xc2, 0xa9, 0xcf, 0xfa, 0x5d, 0xb9, 0xe4, 0xa3, 0xb1, 0x25, 0x77, 0xbd, 0x23, 0x21, - 0x30, 0x61, 0xd1, 0x06, 0x51, 0x2c, 0x86, 0x0e, 0xa1, 0x2d, 0xc0, 0x28, 0x94, 0xf5, 0x6e, 0xac, - 0x4c, 0xa0, 0xb9, 0x9b, 0xe9, 0x7b, 0x09, 0xbd, 0x0c, 0x91, 0x42, 0x27, 0xba, 0xb1, 0xce, 0x0c, - 0xd6, 0x5c, 0xef, 0x7b, 0xd0, 0xd5, 0xb0, 0x14, 0x6a, 0x97, 0x24, 0x30, 0x6d, 0x09, 0x4c, 0x26, - 0x68, 0xff, 0xbe, 0x06, 0xbd, 0xfc, 0x36, 0x38, 0x84, 0x25, 0x71, 0xc4, 0x08, 0x7a, 0x04, 0x3d, - 0x7d, 0x9c, 0x19, 0xfd, 0x86, 0xb8, 0x01, 0x0d, 0x29, 0x97, 0x97, 0x64, 0xc6, 0x59, 0x54, 0x8c, - 0x23, 0xfa, 0x0d, 0xd9, 0x17, 0x64, 0xb4, 0x02, 0x73, 0x01, 0xc1, 0x3e, 0x49, 0xe5, 0x9d, 0x69, - 0x3a, 0x7a, 0x84, 0xde, 0x83, 0xc5, 0x90, 0xf0, 0x94, 0x7a, 0xcc, 0xc5, 0xbe, 0x9f, 0x12, 0xc6, - 0xf4, 0xd5, 0xe9, 0x68, 0xf2, 0xb6, 0xa2, 0xa2, 0x8f, 0xa1, 0x9f, 0x09, 0x52, 0x71, 0xc6, 0x2f, - 0x70, 0xe0, 0x32, 0xe2, 0xc5, 0x91, 0xcf, 0xf4, 0x3d, 0x5a, 0xd1, 0xfc, 0x3d, 0xcd, 0x3e, 0x52, - 0x5c, 0xf4, 0x04, 0xba, 0x8c, 0xc7, 0x29, 0x3e, 0x23, 0xee, 0x09, 0xf6, 0xce, 0x89, 0x98, 0x31, - 0x2b, 0xc1, 0x5b, 0x35, 0xc0, 0x3b, 0x52, 0x22, 0x8f, 0x95, 0x84, 0xb3, 0xc8, 0x4a, 0x63, 0x66, - 0x7f, 0x57, 0x87, 0xfe, 0xb4, 0x6b, 0x20, 0xe3, 0x83, 0x2f, 0xb7, 0xde, 0x76, 0x6a, 0xd4, 0x17, - 0xf7, 0x4f, 0x40, 0x22, 0xf7, 0x3a, 0xe3, 0xc8, 0x6f, 0x74, 0x1f, 0xc0, 0x8b, 0x83, 0x80, 0x78, - 0x62, 0xa2, 0xde, 0xa4, 0x41, 0x11, 0xf7, 0x53, 0x5e, 0xf9, 0x22, 0x34, 0xcc, 0x38, 0x4d, 0x41, - 0x51, 0x51, 0xe1, 0x01, 0x2c, 0x28, 0xf7, 0x69, 0x01, 0x15, 0x15, 0x5a, 0x8a, 0xa6, 0x44, 0xde, - 0x07, 0x94, 0x1d, 0x93, 0x93, 0x51, 0x2e, 0x38, 0x27, 0x05, 0xbb, 0x9a, 0xf3, 0x78, 0x94, 0x49, - 0xbf, 0x05, 0xcd, 0x94, 0x60, 0xdf, 0x8d, 0xa3, 0x60, 0x24, 0x03, 0x45, 0xc3, 0x69, 0x08, 0xc2, - 0x17, 0x51, 0x30, 0x42, 0xff, 0x07, 0xbd, 0x94, 0x24, 0x01, 0xf5, 0xb0, 0x9b, 0x04, 0xd8, 0x23, - 0x21, 0x89, 0xb2, 0x98, 0xd1, 0xd5, 0x8c, 0xe7, 0x19, 0x1d, 0xf5, 0x61, 0xfe, 0x82, 0xa4, 0x4c, - 0x6c, 0xab, 0x29, 0x45, 0xb2, 0x21, 0xea, 0x42, 0x9d, 0xf3, 0xa0, 0x0f, 0x92, 0x2a, 0x3e, 0xd1, - 0x43, 0xe8, 0x7a, 0x71, 0x98, 0x60, 0x8f, 0xbb, 0x29, 0xb9, 0xa0, 0x72, 0x52, 0x4b, 0xb2, 0x17, - 0x35, 0xdd, 0xd1, 0x64, 0xb1, 0x9d, 0x30, 0xf6, 0xe9, 0x29, 0x25, 0xbe, 0x8b, 0xb9, 0x76, 0xb6, - 0xbc, 0xb8, 0x75, 0xa7, 0x9b, 0x71, 0xb6, 0xb9, 0x72, 0x33, 0xda, 0x84, 0xa5, 0x94, 0x84, 0x31, - 0x27, 0x6e, 0xe6, 0xec, 0x08, 0x87, 0xa4, 0xdf, 0x96, 0x38, 0xf7, 0x14, 0x4b, 0xfb, 0xf8, 0x10, - 0x87, 0x44, 0x68, 0xaf, 0xc8, 0x8b, 0x58, 0xdb, 0x91, 0xe2, 0xdd, 0x92, 0xf8, 0x33, 0x32, 0xb2, - 0xff, 0x66, 0xc1, 0xbd, 0x2b, 0x43, 0xce, 0xd8, 0x11, 0xb8, 0xce, 0xdd, 0x3f, 0x16, 0xc2, 0xf6, - 0x10, 0xd6, 0xae, 0x09, 0x04, 0xd7, 0xd8, 0x5a, 0x1b, 0xb3, 0xd5, 0x86, 0x36, 0xf1, 0x5c, 0x1a, - 0xf9, 0xe4, 0xd2, 0x3d, 0xa1, 0x5c, 0x5d, 0xd1, 0xb6, 0xd3, 0x22, 0xde, 0x9e, 0xa0, 0x3d, 0xa6, - 0x9c, 0xd9, 0xdf, 0x5a, 0xd0, 0x29, 0xdf, 0x21, 0x71, 0x0b, 0xf8, 0x28, 0x21, 0x3a, 0x6f, 0xca, - 0x6f, 0xbd, 0x74, 0x4d, 0x67, 0x52, 0x1f, 0xed, 0x01, 0x24, 0x69, 0x9c, 0x90, 0x94, 0x53, 0x22, - 0xf4, 0x8a, 0x6b, 0xf9, 0x70, 0xea, 0xb5, 0xdc, 0x7c, 0x9e, 0xcb, 0xee, 0x46, 0x3c, 0x1d, 0x39, - 0xc6, 0xe4, 0xc1, 0xa7, 0xb0, 0x58, 0x61, 0x0b, 0x74, 0x84, 0x57, 0x95, 0x01, 0xe2, 0x13, 0x2d, - 0xc3, 0xec, 0x05, 0x0e, 0x86, 0x44, 0x9b, 0xa0, 0x06, 0xbf, 0xa8, 0x7d, 0x6c, 0xd9, 0xf3, 0x30, - 0xbb, 0x1b, 0x26, 0x7c, 0x24, 0x76, 0xb2, 0x78, 0x34, 0x4c, 0x48, 0xfa, 0x38, 0x88, 0xbd, 0xf3, - 0xdd, 0x4b, 0x9e, 0x62, 0xf4, 0x05, 0x74, 0x48, 0x8a, 0xd9, 0x30, 0x15, 0xb7, 0xca, 0xa7, 0xd1, - 0x99, 0xd4, 0x59, 0x4e, 0x49, 0x95, 0x39, 0x9b, 0xbb, 0x6a, 0xc2, 0x8e, 0x94, 0x77, 0xda, 0xc4, - 0x1c, 0x0e, 0xbe, 0x82, 0x76, 0x89, 0x2f, 0xc0, 0x12, 0x09, 0x5c, 0x7b, 0x45, 0x7e, 0x8b, 0xa0, - 0x99, 0xe0, 0x94, 0xf2, 0x91, 0x2e, 0x34, 0xf4, 0x48, 0x84, 0x0a, 0x1d, 0x78, 0xa9, 0xaf, 0x40, - 0x6b, 0x3b, 0x4d, 0x45, 0xd9, 0xf3, 0x99, 0xfd, 0x14, 0x96, 0x9f, 0x11, 0x92, 0xec, 0xc4, 0x51, - 0x44, 0x3c, 0x4e, 0x7c, 0x87, 0xfc, 0x76, 0x48, 0x18, 0x17, 0x4b, 0xc8, 0x3b, 0xa1, 0xfd, 0x21, - 0xbe, 0x45, 0x14, 0x38, 0x4b, 0x13, 0xcf, 0x35, 0xca, 0x99, 0x86, 0x20, 0x88, 0x9a, 0xc0, 0xfe, - 0xab, 0x05, 0x1d, 0x75, 0x96, 0xf6, 0x63, 0x4f, 0x9e, 0x20, 0x81, 0xa8, 0x28, 0x6f, 0x34, 0xa2, - 0xc3, 0x34, 0xa8, 0xd4, 0x3d, 0xb5, 0x6a, 0xdd, 0xb3, 0x0a, 0x0d, 0x59, 0x18, 0x14, 0x96, 0xce, - 0x8b, 0x5c, 0x4f, 0x7d, 0x56, 0x84, 0x34, 0x5f, 0xb1, 0x67, 0x24, 0xbb, 0x95, 0xe5, 0x6e, 0x21, - 0x52, 0xa4, 0x8d, 0x59, 0x33, 0x6d, 0xd8, 0xc7, 0xb0, 0xb4, 0x1f, 0xc7, 0xe7, 0xc3, 0x44, 0x99, - 0x97, 0xed, 0xb0, 0x0c, 0x8c, 0xb5, 0x5e, 0x17, 0xb6, 0xe4, 0xc0, 0x5c, 0x77, 0xce, 0xed, 0xff, - 0x58, 0xb0, 0x5c, 0x56, 0xab, 0x33, 0xdd, 0xd7, 0xb0, 0x94, 0xeb, 0x75, 0x03, 0x8d, 0x85, 0x5a, - 0xa0, 0xb5, 0xf5, 0x81, 0x71, 0x06, 0x26, 0xcd, 0xce, 0xaa, 0x27, 0x3f, 0x03, 0xd1, 0xe9, 0x5d, - 0x54, 0x28, 0x6c, 0x70, 0x09, 0xdd, 0xaa, 0x98, 0xf0, 0x4d, 0xbe, 0xaa, 0x46, 0xbc, 0x91, 0xcd, - 0x44, 0x3f, 0x85, 0x66, 0x61, 0x48, 0x4d, 0x1a, 0xb2, 0x54, 0x32, 0x44, 0xaf, 0x55, 0x48, 0x89, - 0xb3, 0x4f, 0xd2, 0x34, 0x4e, 0x75, 0x34, 0x52, 0x03, 0xfb, 0x13, 0x68, 0xfc, 0x60, 0xef, 0xda, - 0xff, 0xa8, 0x41, 0x7b, 0x9b, 0x31, 0x7a, 0x16, 0x65, 0x2e, 0x58, 0x86, 0x59, 0x95, 0x77, 0x54, - 0x21, 0xa0, 0x06, 0x68, 0x1d, 0x5a, 0x3a, 0xa8, 0x19, 0xd0, 0x9b, 0xa4, 0x6b, 0xe3, 0xa5, 0x0e, - 0x74, 0x33, 0xca, 0x34, 0x91, 0x4a, 0x2a, 0x55, 0xf0, 0xec, 0xd4, 0x2a, 0x78, 0xce, 0xa8, 0x82, - 0xdf, 0x82, 0xa6, 0x9c, 0x14, 0xc5, 0x3e, 0xd1, 0xe5, 0x71, 0x43, 0x10, 0x0e, 0x63, 0x9f, 0xa0, - 0x2d, 0x58, 0x09, 0x49, 0x18, 0xa7, 0x23, 0x37, 0xc4, 0x89, 0x2b, 0x8a, 0x70, 0x59, 0xd8, 0x84, - 0x27, 0x3a, 0x30, 0x23, 0xc5, 0x3d, 0xc0, 0xc9, 0x01, 0xbe, 0x14, 0xb5, 0xcd, 0xc1, 0x09, 0xda, - 0x82, 0xdb, 0x5f, 0xa6, 0x94, 0xe3, 0x93, 0x80, 0x94, 0x8b, 0x7b, 0x15, 0xa8, 0x97, 0x32, 0xa6, - 0x51, 0xe1, 0xdb, 0x7f, 0xb1, 0xa0, 0x93, 0xa1, 0xa6, 0x4f, 0x58, 0x17, 0xea, 0xa7, 0xb9, 0x97, - 0xc5, 0x67, 0xe6, 0x8b, 0xda, 0x34, 0x5f, 0x8c, 0x75, 0x18, 0x39, 0xf2, 0x33, 0x26, 0xf2, 0xb9, - 0xd3, 0x67, 0x0d, 0xa7, 0x0b, 0x68, 0xf0, 0x90, 0xbf, 0xca, 0xa0, 0x11, 0xdf, 0xf6, 0x19, 0xf4, - 0x8e, 0x38, 0xe6, 0x94, 0x71, 0xea, 0xb1, 0xcc, 0x9d, 0x15, 0xc7, 0x59, 0xd7, 0x39, 0xae, 0x36, - 0xcd, 0x71, 0xf5, 0xdc, 0x71, 0xf6, 0xbf, 0x2c, 0x40, 0xe6, 0x4a, 0x1a, 0x82, 0x1f, 0x61, 0x29, - 0x01, 0x19, 0x8f, 0xb9, 0x28, 0x15, 0x45, 0x39, 0xa6, 0x8b, 0x2a, 0x49, 0x11, 0xee, 0x13, 0xa7, - 0x61, 0xc8, 0x88, 0xaf, 0xb8, 0xaa, 0xa2, 0x6a, 0x08, 0x82, 0x64, 0x96, 0x0b, 0xb2, 0xb9, 0x4a, - 0x41, 0x66, 0x6f, 0x43, 0x4b, 0x27, 0xa7, 0x63, 0x91, 0xd8, 0xae, 0xb7, 0x5e, 0x5b, 0x57, 0x2b, - 0x80, 0x58, 0x07, 0xd8, 0x29, 0xac, 0x9f, 0x10, 0x9e, 0xed, 0xdf, 0xc1, 0xed, 0x42, 0x62, 0x9f, - 0x32, 0x9e, 0xf9, 0xe5, 0x23, 0x58, 0xa1, 0x91, 0x17, 0x0c, 0x7d, 0xe2, 0x46, 0x22, 0xbd, 0x07, - 0x79, 0x67, 0x63, 0xc9, 0x52, 0x6e, 0x59, 0x73, 0x0f, 0x25, 0x33, 0xeb, 0x70, 0xde, 0x07, 0x94, - 0xcd, 0x22, 0x5e, 0x3e, 0xa3, 0x26, 0x67, 0x74, 0x35, 0x67, 0xd7, 0xd3, 0xd2, 0xf6, 0x0b, 0x58, - 0xa9, 0x2e, 0xae, 0x5d, 0xf5, 0x73, 0x68, 0x15, 0xb0, 0x67, 0x71, 0xf0, 0xb6, 0x11, 0x7e, 0x8a, - 0x79, 0x8e, 0x29, 0x69, 0xff, 0x3f, 0xdc, 0x29, 0x58, 0x4f, 0x64, 0xa0, 0xbf, 0x22, 0x3b, 0xd9, - 0x03, 0xe8, 0x8f, 0x8b, 0x2b, 0x1b, 0xec, 0x3f, 0xd7, 0x61, 0xe1, 0x89, 0xbe, 0xb9, 0xa2, 0xc6, - 0x31, 0xaa, 0x1a, 0x55, 0x5a, 0x3c, 0x80, 0x85, 0xd2, 0x85, 0x54, 0xc5, 0x78, 0xeb, 0xc2, 0x68, - 0xb5, 0x27, 0x35, 0xe5, 0x75, 0x29, 0x56, 0x6d, 0xca, 0x1f, 0x41, 0xef, 0x34, 0x25, 0x64, 0xbc, - 0x7f, 0x9f, 0x71, 0x16, 0x05, 0xc3, 0x94, 0xdd, 0x84, 0x25, 0xec, 0x71, 0x7a, 0x51, 0x91, 0x56, - 0xe7, 0xab, 0xa7, 0x58, 0xa6, 0xfc, 0xe7, 0xb9, 0xa1, 0x34, 0x3a, 0x8d, 0x59, 0x7f, 0xee, 0xfb, - 0xf7, 0xdf, 0x7a, 0x37, 0x82, 0xc3, 0xd0, 0x73, 0xe8, 0x64, 0x7d, 0x9c, 0xd6, 0x34, 0x7f, 0xe3, - 0x1e, 0x71, 0x81, 0x14, 0x2c, 0x66, 0x14, 0xd5, 0xa5, 0x9d, 0x34, 0xd4, 0x4e, 0x14, 0xcb, 0x0c, - 0x6c, 0xff, 0xac, 0x41, 0xc3, 0xc1, 0xde, 0xf9, 0x9b, 0xed, 0x8f, 0xcf, 0x60, 0x31, 0xcf, 0x11, - 0x25, 0x97, 0xdc, 0x31, 0x80, 0x34, 0x8f, 0x9e, 0xd3, 0xf6, 0x8d, 0xd1, 0x54, 0xd8, 0xe6, 0xa7, - 0xc1, 0xf6, 0xf7, 0x1a, 0x74, 0x9e, 0xe4, 0x79, 0xeb, 0xcd, 0x06, 0x6f, 0x0b, 0x40, 0x24, 0xda, - 0x12, 0x6e, 0x66, 0x61, 0x92, 0x1d, 0x0f, 0xa7, 0x99, 0xea, 0xaf, 0x9b, 0xe3, 0xf5, 0x6d, 0x0d, - 0x16, 0x8e, 0xe3, 0x24, 0x0e, 0xe2, 0xb3, 0xd1, 0x9b, 0x8d, 0xd6, 0x2e, 0xf4, 0x8c, 0x1a, 0xa6, - 0x04, 0xda, 0x6a, 0xe5, 0xb0, 0x15, 0x87, 0xc3, 0x59, 0xf4, 0x4b, 0xe3, 0x9b, 0x03, 0xb8, 0x04, - 0x3d, 0x5d, 0xd7, 0x17, 0x29, 0xc5, 0xfe, 0xa3, 0x05, 0xc8, 0xa4, 0xea, 0x58, 0xff, 0x4b, 0x68, - 0x73, 0x8d, 0xb5, 0xb4, 0x4f, 0x77, 0x3e, 0xe6, 0x5d, 0x30, 0x7d, 0xe1, 0x2c, 0x70, 0xd3, 0x33, - 0x3f, 0x81, 0xe5, 0xb1, 0x37, 0x22, 0x51, 0x50, 0x29, 0x8f, 0xf4, 0x2a, 0xcf, 0x44, 0x07, 0x27, - 0xf6, 0x47, 0x70, 0x5b, 0x15, 0xd1, 0x59, 0x1e, 0xca, 0xf2, 0xc3, 0x58, 0x35, 0xdc, 0x2e, 0xaa, - 0x61, 0xfb, 0x3b, 0x0b, 0x56, 0xaa, 0xd3, 0xb4, 0xfd, 0x57, 0xcd, 0x43, 0x18, 0x90, 0x8e, 0x97, - 0x66, 0x5d, 0xaf, 0xca, 0xe9, 0x0f, 0xc7, 0xea, 0xfa, 0xaa, 0xee, 0xcd, 0x2c, 0x8e, 0x16, 0xa5, - 0x7d, 0x97, 0x95, 0x09, 0x6c, 0x80, 0xa1, 0x37, 0x26, 0x26, 0xba, 0xa2, 0x6c, 0x5d, 0x6d, 0xd3, - 0xbc, 0x9e, 0xf8, 0x03, 0x0a, 0x7b, 0x7b, 0x0d, 0xee, 0x3d, 0x25, 0xfc, 0x40, 0xca, 0xec, 0xc4, - 0xd1, 0x29, 0x3d, 0x1b, 0xa6, 0x4a, 0xa8, 0x70, 0xed, 0xfd, 0x69, 0x12, 0x1a, 0xa6, 0x09, 0x0f, - 0x71, 0xd6, 0x8d, 0x1f, 0xe2, 0x6a, 0x57, 0x3d, 0xc4, 0xd9, 0x9f, 0x40, 0x5f, 0x9c, 0x2c, 0x6d, - 0x45, 0x40, 0x49, 0xc4, 0xf3, 0x3a, 0x73, 0x0d, 0x5a, 0x9e, 0xa4, 0xb8, 0xc6, 0x93, 0x01, 0x28, - 0x92, 0xa8, 0xaf, 0xec, 0xc7, 0xb0, 0x3a, 0x61, 0xb2, 0x36, 0xfe, 0x5d, 0xe8, 0xc8, 0x2e, 0x56, - 0x5b, 0x4e, 0xb2, 0xde, 0xaf, 0x2d, 0xa8, 0xdb, 0x19, 0xd1, 0x0e, 0x61, 0x65, 0x9f, 0x60, 0x46, - 0xb6, 0xfd, 0x90, 0x46, 0xc7, 0xf1, 0x39, 0xc9, 0xbb, 0x96, 0x77, 0xa1, 0x93, 0xa4, 0xe4, 0x82, - 0xc6, 0x43, 0xe6, 0x72, 0xc1, 0x90, 0x16, 0xd4, 0x9d, 0x76, 0x46, 0x95, 0xd2, 0xa2, 0x7e, 0xca, - 0xc5, 0x44, 0xa3, 0xef, 0x72, 0x1a, 0xaa, 0xa7, 0x84, 0xba, 0xd3, 0xcd, 0x38, 0xfb, 0xb1, 0x77, - 0x7e, 0x4c, 0x43, 0x62, 0xff, 0xc1, 0x82, 0x3b, 0x63, 0xeb, 0x69, 0x8b, 0xef, 0x01, 0x50, 0xe6, - 0xe2, 0x20, 0x88, 0x5f, 0x13, 0x5f, 0xd7, 0x6c, 0x4d, 0xca, 0xb6, 0x15, 0xa1, 0xa8, 0xda, 0x6b, - 0x66, 0xd5, 0x7e, 0x17, 0x40, 0xad, 0xca, 0xdc, 0x48, 0x3d, 0xc2, 0xd4, 0x9d, 0x86, 0xa0, 0x1c, - 0xb3, 0x43, 0xd9, 0xde, 0x29, 0xd3, 0x67, 0x24, 0x43, 0x0d, 0xec, 0x18, 0xfa, 0x0e, 0x09, 0xfe, - 0x87, 0xbb, 0x7e, 0x0b, 0x56, 0x27, 0x2c, 0xa8, 0x8b, 0xb6, 0x7d, 0xb8, 0xf3, 0x92, 0xa4, 0xf4, - 0x74, 0x34, 0x6e, 0x4c, 0x6e, 0xbe, 0x65, 0x98, 0x2f, 0x6e, 0x6f, 0x75, 0x49, 0xb5, 0x63, 0xb1, - 0xd4, 0xcf, 0xa0, 0x3f, 0xae, 0x4d, 0x03, 0xbc, 0x0a, 0x0d, 0xca, 0xdc, 0x0b, 0x1c, 0xd0, 0x0c, - 0xde, 0x79, 0xca, 0x5e, 0x8a, 0xe1, 0xd6, 0xbf, 0x9b, 0x30, 0x7f, 0x44, 0xf0, 0x6b, 0x42, 0x7c, - 0xb4, 0x07, 0xed, 0x23, 0x12, 0xf9, 0xc5, 0xaf, 0x9e, 0x65, 0xe3, 0xae, 0xe5, 0xd4, 0xc1, 0xdd, - 0x49, 0xd4, 0x7c, 0x57, 0xb7, 0x36, 0xac, 0x0f, 0x2c, 0xf4, 0x02, 0xda, 0xa5, 0x67, 0x17, 0xb4, - 0x66, 0x4c, 0x9a, 0xf4, 0x20, 0x33, 0x58, 0x1d, 0x2b, 0xcc, 0xb2, 0xdb, 0x9d, 0xab, 0x5c, 0x30, - 0x5f, 0x14, 0xd0, 0xfd, 0xa9, 0x4f, 0x0d, 0x4a, 0xe1, 0xda, 0x35, 0x4f, 0x11, 0xf6, 0x2d, 0xf4, - 0x19, 0xcc, 0xa9, 0xd6, 0x13, 0xf5, 0x0d, 0xe1, 0x52, 0x0f, 0x5f, 0xb2, 0xab, 0xdc, 0xa7, 0xda, - 0xb7, 0xd0, 0x33, 0x80, 0xa2, 0x79, 0x43, 0x77, 0x4b, 0x6f, 0x75, 0x95, 0xee, 0x71, 0x70, 0x6f, - 0x0a, 0x37, 0x57, 0xf6, 0x25, 0x74, 0xca, 0x2d, 0x06, 0x5a, 0x9f, 0xd8, 0x45, 0x18, 0x79, 0x6a, - 0xf0, 0xe0, 0x0a, 0x89, 0x5c, 0xf1, 0x6f, 0xa0, 0x5b, 0xed, 0x1c, 0x90, 0x3d, 0x71, 0x62, 0xa9, - 0x0b, 0x19, 0xbc, 0x7d, 0xa5, 0x8c, 0x09, 0x42, 0x91, 0x2a, 0x4b, 0x20, 0x8c, 0xe5, 0xd5, 0x12, - 0x08, 0xe3, 0xf9, 0x55, 0x81, 0x50, 0xce, 0x2f, 0x25, 0x10, 0x26, 0x66, 0xc3, 0x12, 0x08, 0x93, - 0x93, 0x93, 0x7d, 0x0b, 0xc5, 0xb0, 0x32, 0x39, 0xea, 0x23, 0xf3, 0xdd, 0xf2, 0xca, 0xd4, 0x31, - 0x78, 0xf8, 0x3d, 0x24, 0xf3, 0x05, 0xbf, 0x86, 0xde, 0x58, 0x90, 0x46, 0x26, 0xa4, 0xd3, 0xe2, - 0xff, 0xe0, 0x9d, 0xab, 0x85, 0xf2, 0x15, 0xbe, 0x82, 0xc5, 0x4a, 0x48, 0x45, 0x25, 0x28, 0x26, - 0x06, 0xba, 0x81, 0x7d, 0x95, 0x88, 0x69, 0xfd, 0x58, 0xe4, 0x2a, 0x59, 0x3f, 0x2d, 0x90, 0x96, - 0xac, 0x9f, 0x1e, 0xfc, 0xe4, 0xa9, 0xac, 0x06, 0xac, 0xd2, 0xa9, 0x9c, 0x12, 0x1b, 0x4b, 0xa7, - 0x72, 0x5a, 0xc4, 0xb3, 0x6f, 0x9d, 0xcc, 0xc9, 0xdf, 0xd8, 0x1f, 0xfe, 0x37, 0x00, 0x00, 0xff, - 0xff, 0x41, 0x4f, 0x53, 0xa0, 0xd6, 0x1e, 0x00, 0x00, + 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, } diff --git a/weed/server/master_grpc_server_admin.go b/weed/server/master_grpc_server_admin.go index b74e9291d..260681e40 100644 --- a/weed/server/master_grpc_server_admin.go +++ b/weed/server/master_grpc_server_admin.go @@ -2,6 +2,7 @@ package weed_server import ( "context" + "fmt" "math/rand" "time" @@ -72,8 +73,7 @@ func (ms *MasterServer) LeaseAdminToken(ctx context.Context, req *master_pb.Leas return resp, nil } // refuse since still locked - resp.Error = "already locked" - return resp, nil + return resp, fmt.Errorf("already locked") } // for fresh lease request ts, token := ms.generateToken() diff --git a/weed/shell/commands.go b/weed/shell/commands.go index 96343971a..2faba4280 100644 --- a/weed/shell/commands.go +++ b/weed/shell/commands.go @@ -28,6 +28,7 @@ type CommandEnv struct { env map[string]string MasterClient *wdclient.MasterClient option ShellOptions + locker *ExclusiveLocker } type command interface { @@ -41,11 +42,13 @@ var ( ) func NewCommandEnv(options ShellOptions) *CommandEnv { - return &CommandEnv{ + ce := &CommandEnv{ env: make(map[string]string), MasterClient: wdclient.NewMasterClient(options.GrpcDialOption, pb.AdminShellClient, "", 0, strings.Split(*options.Masters, ",")), option: options, } + ce.locker = NewExclusiveLocker(ce.MasterClient) + return ce } func (ce *CommandEnv) parseUrl(input string) (path string, err error) { diff --git a/weed/shell/exclusive_locker.go b/weed/shell/exclusive_locker.go new file mode 100644 index 000000000..9485b255c --- /dev/null +++ b/weed/shell/exclusive_locker.go @@ -0,0 +1,95 @@ +package shell + +import ( + "context" + "sync/atomic" + "time" + + "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/pb/master_pb" + "github.com/chrislusf/seaweedfs/weed/wdclient" +) + +const ( + RenewInteval = 4 * time.Second + SafeRenewInteval = 3 * time.Second +) + +type ExclusiveLocker struct { + masterClient *wdclient.MasterClient + token int64 + lockTsNs int64 + isLocking bool +} + +func NewExclusiveLocker(masterClient *wdclient.MasterClient) *ExclusiveLocker { + return &ExclusiveLocker{ + masterClient: masterClient, + } +} + +func (l *ExclusiveLocker) GetToken() (token int64, lockTsNs int64) { + for time.Unix(0, atomic.LoadInt64(&l.lockTsNs)).Add(SafeRenewInteval).Before(time.Now()) { + // wait until now is within the safe lock period, no immediate renewal to change the token + time.Sleep(100 * time.Millisecond) + } + return atomic.LoadInt64(&l.token), atomic.LoadInt64(&l.lockTsNs) +} + +func (l *ExclusiveLocker) Lock() { + // retry to get the lease + for { + if err := l.masterClient.WithClient(func(client master_pb.SeaweedClient) error { + resp, err := client.LeaseAdminToken(context.Background(), &master_pb.LeaseAdminTokenRequest{ + PreviousToken: atomic.LoadInt64(&l.token), + PreviousLockTime: atomic.LoadInt64(&l.lockTsNs), + }) + if err == nil { + atomic.StoreInt64(&l.token, resp.Token) + atomic.StoreInt64(&l.lockTsNs, resp.LockTsNs) + } + return err + }); err != nil { + time.Sleep(RenewInteval) + } else { + break + } + } + + l.isLocking = true + + // start a goroutine to renew the lease + go func() { + for l.isLocking { + if err := l.masterClient.WithClient(func(client master_pb.SeaweedClient) error { + resp, err := client.LeaseAdminToken(context.Background(), &master_pb.LeaseAdminTokenRequest{ + PreviousToken: atomic.LoadInt64(&l.token), + PreviousLockTime: atomic.LoadInt64(&l.lockTsNs), + }) + if err == nil { + atomic.StoreInt64(&l.token, resp.Token) + atomic.StoreInt64(&l.lockTsNs, resp.LockTsNs) + } + return err + }); err != nil { + glog.Error("failed to renew lock: %v", err) + return + } else { + time.Sleep(RenewInteval) + } + + } + }() + +} + +func (l *ExclusiveLocker) Unlock() { + l.isLocking = false + l.masterClient.WithClient(func(client master_pb.SeaweedClient) error { + client.ReleaseAdminToken(context.Background(), &master_pb.ReleaseAdminTokenRequest{ + PreviousToken: atomic.LoadInt64(&l.token), + PreviousLockTime: atomic.LoadInt64(&l.lockTsNs), + }) + return nil + }) +}