From 98038fd1af4b009773f4f767bd2f1cf52fb48d1f Mon Sep 17 00:00:00 2001 From: yux0 Date: Thu, 29 Sep 2022 21:36:39 -0700 Subject: [PATCH 1/3] Update replication use branch token --- api/persistence/v1/executions.pb.go | 465 ++++++++++-------- .../serialization/task_serializer.go | 2 + .../api/persistence/v1/executions.proto | 1 + service/history/replication/ack_manager.go | 54 +- .../history/replication/ack_manager_test.go | 8 +- .../history/tasks/history_replication_task.go | 7 +- service/history/timerQueueTaskExecutorBase.go | 14 +- service/history/workflow/context.go | 4 +- service/history/workflow/task_generator.go | 4 - 9 files changed, 318 insertions(+), 241 deletions(-) diff --git a/api/persistence/v1/executions.pb.go b/api/persistence/v1/executions.pb.go index 9f98451d80c..af7d0de4106 100644 --- a/api/persistence/v1/executions.pb.go +++ b/api/persistence/v1/executions.pb.go @@ -941,6 +941,7 @@ type ReplicationTaskInfo struct { NewRunBranchToken []byte `protobuf:"bytes,13,opt,name=new_run_branch_token,json=newRunBranchToken,proto3" json:"new_run_branch_token,omitempty"` TaskId int64 `protobuf:"varint,15,opt,name=task_id,json=taskId,proto3" json:"task_id,omitempty"` VisibilityTime *time.Time `protobuf:"bytes,16,opt,name=visibility_time,json=visibilityTime,proto3,stdtime" json:"visibility_time,omitempty"` + NewRunId string `protobuf:"bytes,17,opt,name=new_run_id,json=newRunId,proto3" json:"new_run_id,omitempty"` } func (m *ReplicationTaskInfo) Reset() { *m = ReplicationTaskInfo{} } @@ -1059,6 +1060,13 @@ func (m *ReplicationTaskInfo) GetVisibilityTime() *time.Time { return nil } +func (m *ReplicationTaskInfo) GetNewRunId() string { + if m != nil { + return m.NewRunId + } + return "" +} + // visibility_task_data column type VisibilityTaskInfo struct { NamespaceId string `protobuf:"bytes,1,opt,name=namespace_id,json=namespaceId,proto3" json:"namespace_id,omitempty"` @@ -2013,212 +2021,213 @@ func init() { } var fileDescriptor_67a714d0e7ba9f37 = []byte{ - // 3278 bytes of a gzipped FileDescriptorProto + // 3291 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x5a, 0x4b, 0x73, 0xdb, 0x46, 0xb6, 0x36, 0x23, 0x48, 0x04, 0x0f, 0x29, 0x0a, 0x82, 0x5e, 0x90, 0x62, 0x53, 0x32, 0x63, 0x27, 0x72, 0xe2, 0x50, 0x91, 0xec, 0x5c, 0xe7, 0x71, 0x6f, 0x72, 0x25, 0xd9, 0x4e, 0xc8, 0xeb, 0x38, 0x0e, 0xa4, 0xc4, 0xa9, 0xdc, 0x4a, 0xb1, 0x20, 0xa0, 0x29, 0x61, 0x04, 0x02, 0x34, 0x00, 0x4a, - 0x66, 0x6a, 0x16, 0x59, 0x4c, 0xcd, 0x3a, 0xbb, 0x99, 0x9f, 0x30, 0x3f, 0x63, 0x16, 0xa9, 0xa9, - 0x59, 0x4d, 0x65, 0x37, 0xd9, 0xcd, 0x44, 0xd9, 0xcc, 0x66, 0x6a, 0xf2, 0x07, 0xa6, 0x6a, 0xaa, - 0x4f, 0x77, 0x83, 0x00, 0x08, 0x49, 0x90, 0x2b, 0x5e, 0x64, 0x47, 0xf4, 0x79, 0xf4, 0xe9, 0xee, - 0xd3, 0xe7, 0xf1, 0x35, 0xe1, 0x56, 0x48, 0xba, 0x3d, 0xcf, 0x37, 0x9c, 0xb5, 0x80, 0xf8, 0x47, - 0xc4, 0x5f, 0x33, 0x7a, 0xf6, 0x5a, 0x8f, 0xf8, 0x81, 0x1d, 0x84, 0xc4, 0x35, 0xc9, 0xda, 0xd1, - 0xfa, 0x1a, 0x79, 0x4a, 0xcc, 0x7e, 0x68, 0x7b, 0x6e, 0xd0, 0xe8, 0xf9, 0x5e, 0xe8, 0xa9, 0x75, - 0x21, 0xd4, 0x60, 0x42, 0x0d, 0xa3, 0x67, 0x37, 0x62, 0x42, 0x8d, 0xa3, 0xf5, 0xa5, 0xda, 0xbe, - 0xe7, 0xed, 0x3b, 0x64, 0x0d, 0x25, 0xf6, 0xfa, 0x9d, 0x35, 0xab, 0xef, 0x1b, 0x54, 0x09, 0xd3, - 0xb1, 0xb4, 0x9c, 0xa6, 0x87, 0x76, 0x97, 0x04, 0xa1, 0xd1, 0xed, 0x71, 0x86, 0xab, 0x16, 0xe9, - 0x11, 0xd7, 0x22, 0xae, 0x69, 0x93, 0x60, 0x6d, 0xdf, 0xdb, 0xf7, 0x70, 0x1c, 0x7f, 0x71, 0x96, - 0x6b, 0x91, 0xf1, 0xd4, 0x6a, 0xd3, 0xeb, 0x76, 0x3d, 0x97, 0x1a, 0xdc, 0x25, 0x41, 0x60, 0xec, - 0x93, 0x4c, 0x2e, 0xe2, 0xf6, 0xbb, 0x01, 0x65, 0x3a, 0xf6, 0xfc, 0xc3, 0x8e, 0xe3, 0x1d, 0x73, - 0xae, 0xeb, 0x09, 0xae, 0x8e, 0x61, 0x3b, 0x7d, 0x9f, 0x8c, 0x2a, 0x7b, 0x39, 0xc1, 0x26, 0x74, - 0x8c, 0xf2, 0xbd, 0x9a, 0xb5, 0xaf, 0xa6, 0xe3, 0x99, 0x87, 0xa3, 0xbc, 0x37, 0xb2, 0x78, 0x23, - 0x3b, 0xd9, 0xb2, 0x38, 0xeb, 0x6b, 0x67, 0xb2, 0xa6, 0x96, 0xf4, 0xca, 0x99, 0xcc, 0xa1, 0x11, - 0x1c, 0x72, 0xc6, 0x9b, 0x59, 0x8c, 0x07, 0x76, 0x10, 0x7a, 0xfe, 0x60, 0xd4, 0xdc, 0xb5, 0x1c, - 0x2e, 0xf3, 0xa4, 0x4f, 0xfa, 0x84, 0xbb, 0x4b, 0xfd, 0x4f, 0x45, 0x28, 0xed, 0x1c, 0x18, 0xbe, - 0xd5, 0x74, 0x3b, 0x9e, 0xba, 0x08, 0x72, 0x40, 0x3f, 0xda, 0xb6, 0xa5, 0x15, 0x56, 0x0a, 0xab, - 0xe3, 0x7a, 0x11, 0xbf, 0x9b, 0x16, 0x25, 0xf9, 0x86, 0xbb, 0x4f, 0x28, 0xe9, 0x85, 0x95, 0xc2, - 0xea, 0x98, 0x5e, 0xc4, 0xef, 0xa6, 0xa5, 0xce, 0xc2, 0xb8, 0x77, 0xec, 0x12, 0x5f, 0x1b, 0x5b, - 0x29, 0xac, 0x96, 0x74, 0xf6, 0xa1, 0xde, 0x04, 0x35, 0x08, 0x3d, 0x87, 0xb8, 0xed, 0xc0, 0x76, - 0x4d, 0xd2, 0xf6, 0x89, 0x4b, 0x8e, 0xb5, 0x09, 0xd4, 0xaa, 0x30, 0xca, 0x0e, 0x25, 0xe8, 0x74, - 0x5c, 0xdd, 0x84, 0x72, 0xbf, 0x67, 0x19, 0x21, 0x69, 0x53, 0x5f, 0xd3, 0x8a, 0x2b, 0x85, 0xd5, - 0xf2, 0xc6, 0x52, 0x83, 0x39, 0x62, 0x43, 0x38, 0x62, 0x63, 0x57, 0x38, 0xe2, 0x96, 0xf4, 0xcd, - 0xdf, 0x96, 0x0b, 0x3a, 0x30, 0x21, 0x3a, 0xac, 0xde, 0x85, 0x9a, 0x6b, 0x74, 0x49, 0xd0, 0x33, - 0x4c, 0xd2, 0x76, 0xbd, 0xd0, 0xee, 0xd8, 0x26, 0x7a, 0x75, 0xfb, 0x88, 0x6e, 0x80, 0xe7, 0x6a, - 0x25, 0xb4, 0xfb, 0x72, 0xc4, 0xf5, 0x30, 0xc6, 0xf4, 0x19, 0xe3, 0x51, 0x7f, 0x53, 0x80, 0x45, - 0x9f, 0xf4, 0x1c, 0x21, 0x6b, 0x39, 0x4f, 0xda, 0x86, 0x79, 0xd8, 0x76, 0xc8, 0x11, 0x71, 0xb4, - 0xc9, 0x95, 0xb1, 0xd5, 0xf2, 0x46, 0xb3, 0x71, 0xfe, 0x25, 0x6b, 0x44, 0xbb, 0xda, 0xd0, 0x87, - 0xea, 0xee, 0x3a, 0x4f, 0x36, 0xcd, 0xc3, 0x07, 0x54, 0xd7, 0x3d, 0x37, 0xf4, 0x07, 0xfa, 0xbc, - 0x9f, 0x49, 0x54, 0x0f, 0x41, 0xc1, 0x73, 0x1a, 0xce, 0x1d, 0x68, 0x0a, 0x4e, 0xbe, 0x79, 0xb1, - 0xc9, 0x3f, 0xa1, 0x5a, 0x84, 0xda, 0x80, 0x4d, 0x5a, 0x7d, 0x92, 0x18, 0x54, 0x0d, 0xa8, 0xb0, - 0xc9, 0x82, 0xd0, 0x08, 0x49, 0xa0, 0x4d, 0xe3, 0x44, 0xef, 0x3d, 0xc3, 0x44, 0x3b, 0xa8, 0x80, - 0xcd, 0x52, 0x7e, 0x32, 0x1c, 0x59, 0x6a, 0xc2, 0x8b, 0x67, 0x6c, 0x83, 0xaa, 0xc0, 0xd8, 0x21, - 0x19, 0xa0, 0xcf, 0x95, 0x74, 0xfa, 0x93, 0x3a, 0xd5, 0x91, 0xe1, 0xf4, 0x09, 0x77, 0x36, 0xf6, - 0xf1, 0xce, 0x0b, 0x6f, 0x15, 0x96, 0x42, 0x98, 0xc9, 0x58, 0x54, 0x5c, 0xc5, 0x38, 0x53, 0xf1, - 0x41, 0x5c, 0x45, 0x79, 0x63, 0x3d, 0xcf, 0x7a, 0x12, 0x9a, 0xe3, 0xb3, 0xba, 0xa0, 0xa4, 0x57, - 0x98, 0x31, 0xe5, 0xdd, 0xe4, 0x94, 0x8d, 0xdc, 0x53, 0xa2, 0xda, 0xd8, 0x7c, 0x2d, 0x49, 0x96, - 0x94, 0xf1, 0x96, 0x24, 0x8f, 0x2b, 0x13, 0x2d, 0x49, 0x96, 0x95, 0x52, 0x4b, 0x92, 0x41, 0x29, - 0xb7, 0x24, 0xb9, 0xac, 0x54, 0x5a, 0x92, 0x5c, 0x51, 0x26, 0x5b, 0x92, 0x5c, 0x55, 0xa6, 0x5a, - 0x92, 0x3c, 0xa5, 0x28, 0xf5, 0x7f, 0xd7, 0x60, 0xee, 0x31, 0x8f, 0x31, 0xf7, 0x44, 0x52, 0xc0, - 0x4b, 0x7d, 0x15, 0x2a, 0xc3, 0x7b, 0xc1, 0x2f, 0x76, 0x49, 0x2f, 0x47, 0x63, 0x4d, 0x4b, 0x5d, - 0x86, 0xb2, 0x88, 0x4f, 0xe2, 0x7e, 0x97, 0x74, 0x10, 0x43, 0x4d, 0x4b, 0x6d, 0xc0, 0x4c, 0xcf, - 0xf0, 0x89, 0x1b, 0xb6, 0x13, 0xaa, 0xd8, 0x85, 0x9f, 0x66, 0xa4, 0x87, 0x31, 0x85, 0x37, 0x41, - 0xe5, 0xfc, 0x71, 0xbd, 0x12, 0xb2, 0x2b, 0x8c, 0xf2, 0x78, 0xa8, 0xbd, 0x0e, 0x93, 0x9c, 0xdb, - 0xef, 0xbb, 0x94, 0x71, 0x9c, 0x99, 0xc8, 0x06, 0xf5, 0xbe, 0x9b, 0xb0, 0xc0, 0x76, 0xed, 0xd0, - 0x36, 0x42, 0x82, 0x51, 0x6a, 0x02, 0xbd, 0x83, 0x5b, 0xd0, 0x14, 0x94, 0xa6, 0xa5, 0xbe, 0x0d, - 0x8b, 0xa6, 0xd7, 0xed, 0x39, 0x04, 0x6f, 0x31, 0x39, 0xa2, 0x92, 0x7b, 0x46, 0x68, 0x1e, 0x50, - 0xa9, 0x22, 0x4a, 0xcd, 0x0f, 0x19, 0xee, 0x51, 0xfa, 0x16, 0x25, 0x37, 0x2d, 0xf5, 0x0a, 0x00, - 0x0d, 0xc0, 0x6d, 0xf4, 0x5f, 0x0c, 0x1a, 0x25, 0xbd, 0x44, 0x47, 0xf0, 0xa4, 0xe8, 0xda, 0xa2, - 0x45, 0x85, 0x83, 0x1e, 0xc1, 0x2d, 0xd1, 0x80, 0xad, 0x4d, 0x50, 0x76, 0x07, 0x3d, 0x42, 0x37, - 0x44, 0xfd, 0x12, 0x96, 0x22, 0xee, 0x28, 0x59, 0x63, 0x90, 0xf3, 0xfa, 0xa1, 0x56, 0x46, 0x37, - 0x59, 0x1c, 0x89, 0x73, 0x77, 0x79, 0x42, 0xde, 0x92, 0x7e, 0x4f, 0xc3, 0x9c, 0x76, 0x9c, 0x3e, - 0xd9, 0x5d, 0xa6, 0x40, 0xfd, 0x04, 0x66, 0x23, 0xf5, 0x74, 0xf3, 0x84, 0xe2, 0x4a, 0x3e, 0xc5, - 0xd1, 0x4a, 0xf4, 0x7e, 0xa4, 0x72, 0x0f, 0xae, 0x58, 0xa4, 0x63, 0xf4, 0x9d, 0xd8, 0xe1, 0xe1, - 0x7e, 0x08, 0xdd, 0x93, 0xf9, 0x74, 0x2f, 0x71, 0x2d, 0xe2, 0xa0, 0x77, 0x8d, 0xe0, 0x50, 0xcc, - 0xf1, 0x1a, 0xa8, 0x8e, 0x11, 0x84, 0xfc, 0x5c, 0x50, 0xbb, 0x6d, 0x69, 0xd3, 0x78, 0x2c, 0x53, - 0x94, 0x82, 0x07, 0x42, 0x25, 0x9a, 0x96, 0xfa, 0x3a, 0xcc, 0x20, 0x73, 0xc7, 0xf6, 0x23, 0x11, - 0xdb, 0xd2, 0x54, 0xe4, 0x56, 0x28, 0xe9, 0x3e, 0xa5, 0xa0, 0x48, 0xd3, 0x52, 0xff, 0x0f, 0x5e, - 0x42, 0xf6, 0xa4, 0xf1, 0x41, 0x68, 0xf8, 0xd4, 0x67, 0x22, 0xf1, 0x19, 0x14, 0xaf, 0x51, 0xd6, - 0xb8, 0x85, 0x3b, 0x8c, 0x4f, 0x28, 0x7b, 0x1f, 0x00, 0x25, 0x59, 0x5a, 0x9a, 0xcd, 0x99, 0x96, - 0x4a, 0x28, 0x83, 0x59, 0xa9, 0x05, 0x68, 0x61, 0x3b, 0x9e, 0xdd, 0xe6, 0x72, 0xaa, 0xa9, 0x52, - 0xc9, 0x4f, 0x87, 0x19, 0x6e, 0x03, 0xe6, 0x92, 0x8b, 0x12, 0x89, 0x6d, 0x1e, 0xd7, 0x32, 0x73, - 0x1c, 0x5b, 0x87, 0xc8, 0x67, 0xf7, 0x61, 0x25, 0xb5, 0x11, 0xe6, 0x01, 0xb1, 0xfa, 0x4e, 0x7c, - 0x2b, 0x16, 0x58, 0x5e, 0x8c, 0x8b, 0xef, 0x08, 0x2e, 0xb1, 0x11, 0x5b, 0x50, 0x3b, 0x67, 0x43, - 0x35, 0xd4, 0xb2, 0x74, 0x7c, 0xfa, 0x66, 0xee, 0xa4, 0xed, 0x17, 0x1e, 0xb5, 0x98, 0xcf, 0xa3, - 0x12, 0x0b, 0x14, 0xae, 0x34, 0xb2, 0x29, 0x46, 0x48, 0x83, 0x6e, 0xa8, 0x2d, 0x61, 0x58, 0x4e, - 0xc8, 0x6c, 0x32, 0x52, 0xe2, 0x52, 0x26, 0x16, 0x83, 0xc7, 0xf3, 0x62, 0xce, 0xe3, 0x59, 0xc8, - 0x58, 0x2a, 0x9e, 0x93, 0x01, 0x97, 0x4f, 0xdb, 0x73, 0x9c, 0xe0, 0x72, 0xce, 0x09, 0x16, 0x33, - 0x4f, 0x04, 0xa7, 0xb8, 0x01, 0x8a, 0x69, 0xb8, 0x26, 0x71, 0xda, 0x3e, 0x79, 0xd2, 0x27, 0x41, - 0x48, 0x2c, 0xed, 0xca, 0x4a, 0x61, 0x55, 0xd6, 0xa7, 0xd8, 0xb8, 0x2e, 0x86, 0x55, 0x1f, 0xae, - 0x27, 0xad, 0xf1, 0x7c, 0x7b, 0xdf, 0x76, 0x0d, 0x27, 0x6d, 0x56, 0x2d, 0xa7, 0x59, 0x57, 0xe3, - 0x66, 0x7d, 0xcc, 0x95, 0x25, 0xcd, 0xbb, 0x03, 0x5a, 0x72, 0x4e, 0x6e, 0x25, 0xf5, 0x93, 0x65, - 0x8c, 0x94, 0x73, 0x71, 0x25, 0xdc, 0xd8, 0xa6, 0xa5, 0xbe, 0x0a, 0xd3, 0xc9, 0x75, 0x51, 0x89, - 0x15, 0x94, 0x48, 0x2e, 0x8c, 0xf1, 0x06, 0xa1, 0x6d, 0x1e, 0x0e, 0xda, 0xb1, 0x70, 0x7d, 0x95, - 0xf1, 0x32, 0xc2, 0x6e, 0x14, 0xb4, 0xf7, 0x61, 0x85, 0xf3, 0x8a, 0x45, 0xb7, 0x43, 0xaf, 0x3d, - 0xbc, 0xda, 0xd4, 0x0b, 0xeb, 0xf9, 0xbc, 0xf0, 0x32, 0x53, 0x24, 0x16, 0xbc, 0xeb, 0xed, 0x88, - 0xcb, 0x4e, 0xdd, 0x51, 0x83, 0xa2, 0x70, 0xc0, 0x97, 0x58, 0x05, 0xcd, 0x3f, 0xd5, 0x4f, 0x61, - 0xde, 0x27, 0xa1, 0x3f, 0xe0, 0x09, 0xcc, 0x69, 0xdb, 0x6e, 0x48, 0xfc, 0x23, 0xc3, 0xd1, 0xae, - 0xe5, 0x9b, 0x78, 0x16, 0xc5, 0x59, 0x92, 0x73, 0x9a, 0x5c, 0x78, 0xa8, 0xb6, 0x6b, 0x3c, 0xb5, - 0xbb, 0xfd, 0xee, 0x50, 0xed, 0xf5, 0x8b, 0xa8, 0xfd, 0x88, 0x49, 0x47, 0x6a, 0x6f, 0xa7, 0xd5, - 0xf2, 0x65, 0x04, 0xda, 0xcb, 0xb8, 0xac, 0x84, 0x14, 0xbf, 0x57, 0x81, 0xfa, 0x0e, 0x2d, 0x9e, - 0xa9, 0xd4, 0x9e, 0x61, 0x1e, 0x7a, 0x9d, 0x4e, 0xdb, 0xf4, 0x48, 0xa7, 0x63, 0x9b, 0x36, 0x71, - 0x43, 0xed, 0x95, 0x95, 0xc2, 0x6a, 0x41, 0x5f, 0x40, 0x86, 0x2d, 0x46, 0xdf, 0x1e, 0x92, 0xd5, - 0x2e, 0xd4, 0x33, 0x32, 0x25, 0x79, 0xda, 0xb3, 0x99, 0xb9, 0xcc, 0x49, 0x57, 0x73, 0x3a, 0xe9, - 0xf2, 0x48, 0xca, 0xbc, 0x17, 0x69, 0xe2, 0xed, 0xc2, 0x32, 0x33, 0xd5, 0xf5, 0xdc, 0x36, 0xfe, - 0x32, 0xf6, 0x1c, 0xd2, 0x26, 0xbe, 0xef, 0xf9, 0x98, 0xd7, 0x03, 0xed, 0xc6, 0xca, 0xd8, 0x6a, - 0x49, 0x7f, 0x11, 0x89, 0x0f, 0x3d, 0x57, 0x17, 0x4c, 0xf7, 0x28, 0x0f, 0xcd, 0xf0, 0x81, 0xba, - 0x0a, 0xca, 0x81, 0x11, 0x30, 0xf9, 0x76, 0xcf, 0x73, 0x6c, 0x73, 0xa0, 0xbd, 0x8a, 0xf7, 0xb0, - 0x7a, 0x60, 0x04, 0x28, 0xf1, 0x08, 0x47, 0xd5, 0x97, 0x60, 0xd2, 0xf4, 0x3d, 0x37, 0xf2, 0x3f, - 0xed, 0x35, 0xf4, 0xd4, 0x0a, 0x1d, 0x14, 0xbe, 0x44, 0x6b, 0xb5, 0xc0, 0xde, 0xa7, 0x77, 0xd3, - 0xf4, 0xfa, 0x6e, 0xa8, 0x35, 0x30, 0xa6, 0x96, 0xd9, 0xd8, 0x36, 0x1d, 0x52, 0x3f, 0x81, 0x69, - 0xa3, 0x1f, 0x7a, 0x6d, 0x9f, 0x04, 0x24, 0x6c, 0xf7, 0x3c, 0xdb, 0x0d, 0x03, 0xed, 0x16, 0xee, - 0xca, 0xf5, 0x61, 0xb9, 0x49, 0xeb, 0xcc, 0xa8, 0xe5, 0x3c, 0x5a, 0x6f, 0xe8, 0x94, 0xfb, 0x11, - 0x32, 0xeb, 0x53, 0x54, 0x3e, 0x36, 0xa0, 0xfe, 0x1a, 0xa6, 0x03, 0x62, 0xf8, 0xe6, 0x01, 0x3d, - 0x64, 0xdf, 0xde, 0xeb, 0xd3, 0x26, 0xe0, 0x36, 0x36, 0x01, 0x1f, 0xe7, 0xa9, 0x60, 0x33, 0xeb, - 0xce, 0xc6, 0x0e, 0xaa, 0xdc, 0x8c, 0x34, 0xb2, 0xae, 0x40, 0x09, 0x52, 0xc3, 0xea, 0x63, 0x90, - 0xba, 0xa4, 0xeb, 0x69, 0x6f, 0xe2, 0x84, 0xdb, 0xcf, 0x3e, 0xe1, 0x47, 0xa4, 0xeb, 0xb1, 0x49, - 0x50, 0xa1, 0xfa, 0x25, 0x4c, 0xf3, 0x04, 0xd9, 0x66, 0x0d, 0xb3, 0x4d, 0x02, 0xed, 0xbf, 0x70, - 0xa7, 0xde, 0xc8, 0x9c, 0x85, 0xb7, 0xd5, 0x74, 0x06, 0x9e, 0x3e, 0x3f, 0x14, 0x72, 0xba, 0x72, - 0x94, 0x1a, 0x51, 0x6f, 0xc1, 0x3c, 0xaf, 0x48, 0x22, 0x67, 0xe5, 0xe5, 0xeb, 0x1d, 0x3c, 0xd9, - 0x19, 0xa4, 0x46, 0x26, 0xb2, 0x32, 0xf6, 0xff, 0x61, 0x6a, 0xc8, 0x4e, 0xdb, 0xad, 0x40, 0x7b, - 0x0b, 0x2d, 0xda, 0xc8, 0xb3, 0xee, 0x48, 0x19, 0x6d, 0x17, 0x02, 0xbd, 0x4a, 0x12, 0xdf, 0x89, - 0xbc, 0x43, 0x4d, 0x49, 0xdf, 0x9d, 0xb7, 0x2f, 0x9a, 0x77, 0xf4, 0x7e, 0xfa, 0xd6, 0xdc, 0x86, - 0x85, 0x91, 0x5a, 0x2c, 0x7c, 0x8a, 0xab, 0x7e, 0x87, 0x15, 0x21, 0xc9, 0x7a, 0x6c, 0xf7, 0x29, - 0x5d, 0xf5, 0x6d, 0x98, 0xc7, 0xd6, 0xb2, 0x1d, 0xfa, 0x86, 0x1b, 0xd8, 0x68, 0x11, 0x73, 0xf0, - 0x77, 0x51, 0x68, 0x16, 0xa9, 0xbb, 0x11, 0x91, 0x79, 0xfa, 0x07, 0x50, 0x4d, 0x56, 0xcc, 0xda, - 0x7f, 0xe7, 0x5c, 0xc0, 0x24, 0x89, 0xd7, 0xc9, 0xea, 0x1a, 0xcc, 0xba, 0xe4, 0x78, 0xf4, 0x9c, - 0xfe, 0x87, 0xb5, 0x2f, 0x2e, 0x39, 0x4e, 0x9d, 0xd2, 0x03, 0xa8, 0xf0, 0x66, 0x03, 0x61, 0x21, - 0xed, 0x3d, 0x9c, 0xf7, 0x46, 0xe6, 0x11, 0x21, 0x07, 0x73, 0x19, 0x33, 0xf4, 0xfc, 0x6d, 0xfa, - 0x29, 0x5a, 0x17, 0xfc, 0x50, 0xdf, 0x02, 0x6d, 0xa4, 0x75, 0x11, 0x95, 0xdb, 0xfb, 0xac, 0x13, - 0x49, 0xf5, 0x2f, 0xa2, 0x78, 0xbb, 0x05, 0xf3, 0xa6, 0xe3, 0x05, 0x7c, 0xdf, 0x3a, 0xc4, 0x8f, - 0x4a, 0xe5, 0xff, 0x65, 0x9b, 0x8d, 0xd4, 0x5d, 0x4e, 0xe4, 0xe5, 0xf2, 0x1d, 0xd0, 0x98, 0xd0, - 0x91, 0x1d, 0xd8, 0x7b, 0xb6, 0x63, 0x87, 0x83, 0x48, 0x6c, 0x13, 0xc5, 0xe6, 0x90, 0xfe, 0x59, - 0x44, 0xe6, 0x82, 0xef, 0x03, 0xf0, 0xd9, 0xe8, 0x5e, 0x6f, 0xe5, 0xad, 0x75, 0x99, 0x0d, 0x76, - 0x97, 0x2c, 0x59, 0x30, 0x97, 0x79, 0xe9, 0x33, 0xda, 0xfb, 0x37, 0x93, 0x8d, 0xf2, 0x72, 0x32, - 0x72, 0x71, 0x5c, 0xed, 0x68, 0xbd, 0xf1, 0xc8, 0x18, 0x38, 0x9e, 0x61, 0xc5, 0x3b, 0xf1, 0xcf, - 0xa1, 0x14, 0xdd, 0xf4, 0x9f, 0x55, 0x73, 0xd4, 0x67, 0x47, 0x5d, 0x75, 0x4b, 0x92, 0x15, 0x65, - 0xba, 0x25, 0xc9, 0x37, 0x95, 0xd7, 0x5b, 0x92, 0xfc, 0xba, 0xd2, 0x68, 0x49, 0xf2, 0x9a, 0xf2, - 0x46, 0x4b, 0x92, 0xdf, 0x50, 0xd6, 0x5b, 0x92, 0xbc, 0xae, 0x6c, 0xb4, 0x24, 0x79, 0x43, 0xb9, - 0x55, 0xbf, 0x05, 0xd5, 0xe4, 0xed, 0xa4, 0xb1, 0x9c, 0x07, 0x94, 0x76, 0x60, 0x7f, 0x45, 0xd0, - 0xc6, 0x31, 0xbd, 0xcc, 0xc7, 0x76, 0xec, 0xaf, 0x48, 0xfd, 0x5f, 0x05, 0x98, 0x1f, 0x89, 0x65, - 0x08, 0x05, 0x60, 0x21, 0xe4, 0x13, 0x7a, 0x67, 0x62, 0x85, 0x50, 0x81, 0x17, 0x42, 0x48, 0x18, - 0x16, 0x42, 0x73, 0x30, 0xc1, 0x3d, 0x9a, 0x75, 0xee, 0xe3, 0x3e, 0x7a, 0x71, 0x0b, 0xc6, 0xf1, - 0x5e, 0x61, 0x9b, 0x5e, 0xdd, 0xb8, 0x9d, 0xe9, 0xbe, 0x88, 0x39, 0x66, 0xc6, 0x54, 0x0e, 0x49, - 0xa0, 0x0a, 0xf5, 0x3e, 0x4c, 0xd0, 0x1f, 0xfd, 0x00, 0x9b, 0xf8, 0x6a, 0x1c, 0xd9, 0x38, 0x5f, - 0x4b, 0x3f, 0xd0, 0xb9, 0x74, 0xfd, 0x27, 0x09, 0x94, 0x84, 0xbf, 0xfe, 0x5c, 0x08, 0xc5, 0x70, - 0x0f, 0xc6, 0xe2, 0x7b, 0xb0, 0x0d, 0x25, 0xd6, 0x69, 0x0c, 0x7a, 0x84, 0x9b, 0xfe, 0xf2, 0xd9, - 0xfb, 0x80, 0xbd, 0xc5, 0xa0, 0x47, 0x74, 0x39, 0xe4, 0xbf, 0xd4, 0x06, 0xcc, 0x84, 0x86, 0xbf, - 0x4f, 0x52, 0xe8, 0x07, 0x43, 0x29, 0xa6, 0x19, 0x29, 0x85, 0x7e, 0x70, 0xfe, 0xb8, 0xcd, 0x13, - 0x0c, 0x21, 0x60, 0x94, 0x24, 0xfa, 0xc1, 0xb9, 0xf9, 0x02, 0x8a, 0x6c, 0xf9, 0x6c, 0x90, 0x05, - 0xa4, 0x24, 0x24, 0x21, 0xa7, 0x21, 0x89, 0x77, 0x61, 0x89, 0xab, 0x30, 0x0f, 0x6c, 0xc7, 0x1a, - 0x4e, 0xeb, 0xb9, 0xce, 0x00, 0x11, 0x0c, 0x59, 0x5f, 0x60, 0x1c, 0xdb, 0x94, 0x41, 0xcc, 0xfe, - 0xb1, 0xeb, 0x0c, 0x10, 0xa8, 0x1d, 0xed, 0x09, 0x81, 0x75, 0xd7, 0x41, 0xba, 0x0f, 0xd4, 0xa0, - 0x28, 0x62, 0x57, 0x99, 0xc1, 0xc0, 0xfc, 0x53, 0x5d, 0x80, 0xa2, 0x08, 0x33, 0x15, 0xa4, 0x4c, - 0x84, 0x2c, 0xae, 0x34, 0x61, 0x2a, 0x1e, 0x8a, 0x68, 0x70, 0x99, 0xcc, 0xdb, 0x01, 0x0f, 0x05, - 0x31, 0x92, 0xdf, 0x04, 0xd5, 0x22, 0x0e, 0x09, 0x49, 0xdb, 0xe8, 0x84, 0xc4, 0x6f, 0x63, 0xec, - 0xd1, 0xa6, 0x70, 0x81, 0x0a, 0xa3, 0x6c, 0x52, 0xc2, 0x36, 0x1d, 0x67, 0x37, 0xb9, 0xfe, 0x3b, - 0x09, 0x66, 0x62, 0xd8, 0xe3, 0x2f, 0xc6, 0xeb, 0x62, 0x3b, 0x3d, 0x9e, 0xdc, 0xe9, 0x6b, 0x50, - 0x4d, 0x61, 0x21, 0x0c, 0x06, 0xab, 0x74, 0xe2, 0x38, 0x48, 0x1d, 0x26, 0x5d, 0xf2, 0x34, 0xc6, - 0xc4, 0x50, 0xaf, 0x32, 0x1d, 0x14, 0x3c, 0xd9, 0x67, 0x2f, 0x9f, 0x72, 0xf6, 0x57, 0xa1, 0xb2, - 0xe7, 0x1b, 0xae, 0x79, 0xd0, 0x0e, 0xbd, 0x43, 0xc2, 0x1c, 0xa0, 0xa2, 0x97, 0xd9, 0xd8, 0x2e, - 0x1d, 0x12, 0xa9, 0x96, 0x6e, 0x4a, 0x82, 0x75, 0x12, 0x59, 0x69, 0xaa, 0xd5, 0xfb, 0xee, 0x56, - 0x4c, 0x20, 0xe6, 0x35, 0x53, 0xe7, 0x79, 0x8d, 0xf2, 0x6c, 0x5e, 0xd3, 0x92, 0xe4, 0x92, 0x02, - 0x11, 0x7e, 0x1a, 0x21, 0xa7, 0xf5, 0x7f, 0x8e, 0x81, 0x9a, 0xca, 0x82, 0xbf, 0x6c, 0xc7, 0x88, - 0x6d, 0xe6, 0xc4, 0x79, 0x9b, 0x59, 0x7c, 0xc6, 0x2b, 0x98, 0xac, 0x12, 0xe4, 0x0b, 0x57, 0x09, - 0x29, 0x48, 0xad, 0x74, 0x71, 0x48, 0xed, 0xac, 0x02, 0x07, 0xce, 0x28, 0x70, 0xea, 0xdf, 0x4a, - 0x30, 0x49, 0x35, 0xfc, 0x72, 0x32, 0xcf, 0x3d, 0xa8, 0x70, 0x74, 0x82, 0xe9, 0x19, 0x47, 0x3d, - 0xf5, 0x53, 0x92, 0x2f, 0xc7, 0x20, 0x50, 0x47, 0x39, 0x1c, 0x7e, 0xa8, 0x24, 0x86, 0x91, 0x89, - 0xce, 0x1c, 0xf5, 0x4d, 0xa0, 0xbe, 0xf5, 0x7c, 0x95, 0x01, 0xef, 0xd9, 0x51, 0x7d, 0x04, 0xab, - 0xc5, 0x06, 0xe3, 0x8e, 0x59, 0x4c, 0x3a, 0xe6, 0x0d, 0x88, 0xa2, 0x49, 0x84, 0xcf, 0xc9, 0x88, - 0x23, 0x4c, 0x89, 0x71, 0x81, 0xcd, 0x2d, 0x82, 0x1c, 0x05, 0x22, 0xf6, 0x60, 0x57, 0x24, 0x3c, - 0xfe, 0xc4, 0xdc, 0x1b, 0xce, 0x73, 0xef, 0xf2, 0x33, 0xba, 0x77, 0x3a, 0xc6, 0x55, 0x46, 0x62, - 0x5c, 0xfd, 0xb7, 0x55, 0xa8, 0x6c, 0x9a, 0xa1, 0x7d, 0x64, 0x87, 0x03, 0xf4, 0xa2, 0xd8, 0xba, - 0x0b, 0xc9, 0x75, 0xdf, 0x01, 0x2d, 0x1d, 0x5f, 0xa3, 0x47, 0x08, 0xf6, 0xb0, 0x35, 0x97, 0x8c, - 0xb2, 0xe2, 0x0d, 0xe2, 0x03, 0xa8, 0xa6, 0xd0, 0x39, 0x29, 0x6f, 0xef, 0x13, 0x24, 0x90, 0xb8, - 0x55, 0x50, 0x46, 0x90, 0x5a, 0x16, 0x35, 0xaa, 0x41, 0x12, 0x9d, 0xdd, 0x86, 0x4a, 0x02, 0x06, - 0xcd, 0x1b, 0x20, 0xca, 0x41, 0x0c, 0xfa, 0x5c, 0x86, 0xb2, 0xc1, 0xb7, 0x46, 0x64, 0x92, 0x92, - 0x0e, 0x62, 0x88, 0x55, 0x32, 0xb1, 0x82, 0x96, 0x3f, 0xae, 0xf8, 0x51, 0x29, 0xfb, 0x05, 0x2c, - 0x9e, 0x0e, 0xd0, 0x41, 0x3e, 0x40, 0x6b, 0x3e, 0xc8, 0x86, 0xe6, 0x52, 0xba, 0x87, 0x51, 0xec, - 0x02, 0x2f, 0x31, 0x31, 0xdd, 0xdb, 0x22, 0xa2, 0x51, 0xdd, 0xbb, 0xd8, 0xe1, 0x52, 0x5b, 0xd3, - 0x8a, 0x73, 0xbe, 0xc4, 0xcc, 0xb0, 0xf8, 0x96, 0xd4, 0xfa, 0x00, 0xa6, 0x0f, 0x88, 0xe1, 0x87, - 0x7b, 0xc4, 0x08, 0x2f, 0xfa, 0xfc, 0xa2, 0x44, 0x92, 0x42, 0x5b, 0x16, 0x66, 0x5c, 0xcd, 0xc6, - 0x8c, 0x33, 0x61, 0x58, 0x96, 0x9f, 0xb3, 0x60, 0x58, 0x6a, 0x9a, 0x1f, 0x21, 0xe9, 0xb4, 0x4b, - 0x50, 0xd8, 0xe5, 0x0e, 0x45, 0xb4, 0x65, 0x6d, 0x40, 0x1c, 0x1d, 0x9d, 0x4e, 0xa2, 0xa3, 0xc9, - 0x0a, 0x57, 0x4d, 0x57, 0xb8, 0x37, 0x86, 0x6e, 0x6c, 0x5b, 0xc4, 0x0d, 0xed, 0x70, 0x80, 0x2f, - 0x38, 0x08, 0xf5, 0xe2, 0x78, 0x93, 0x0f, 0x67, 0x42, 0x72, 0xb3, 0x99, 0x90, 0xdc, 0xe9, 0x88, - 0xec, 0xdc, 0xf3, 0x41, 0x64, 0xe7, 0x9f, 0x0f, 0x22, 0xbb, 0x70, 0x06, 0x22, 0xbb, 0x0b, 0x73, - 0x4c, 0x2a, 0x0d, 0x06, 0x69, 0x39, 0xaf, 0xf7, 0x0c, 0x8a, 0xa7, 0x60, 0xa0, 0x33, 0x71, 0xde, - 0xc5, 0xb3, 0x71, 0xde, 0x1c, 0xc0, 0xeb, 0xd2, 0xf9, 0xc0, 0xeb, 0x43, 0x50, 0x99, 0x16, 0x06, - 0x47, 0xb1, 0xff, 0x04, 0xf1, 0xa7, 0x9b, 0x95, 0x64, 0x7e, 0xe4, 0x44, 0x9a, 0xca, 0xee, 0xb3, - 0x9f, 0xba, 0x82, 0xb2, 0x0f, 0x8c, 0x20, 0xe4, 0x23, 0xb4, 0x85, 0x8a, 0xe9, 0xa3, 0xd9, 0x8d, - 0xf8, 0x43, 0x57, 0xbb, 0x8c, 0xae, 0xb6, 0x10, 0x49, 0x3d, 0x46, 0x7a, 0xe4, 0x72, 0xd9, 0x65, - 0x74, 0xed, 0x94, 0x32, 0xfa, 0x33, 0x98, 0xc7, 0x49, 0x86, 0x57, 0xdb, 0x22, 0xa1, 0x61, 0x3b, - 0x01, 0x3e, 0x8d, 0x8c, 0x98, 0x3f, 0x02, 0x59, 0x04, 0xfa, 0x2c, 0x95, 0xff, 0x50, 0x88, 0xdf, - 0x65, 0xd2, 0xea, 0x97, 0xb0, 0x94, 0xd2, 0x1b, 0x7f, 0x74, 0x5c, 0xc9, 0xfb, 0xaa, 0x95, 0xd0, - 0x3d, 0x7c, 0x7d, 0x6c, 0x49, 0xf2, 0x98, 0x22, 0xb5, 0x24, 0x79, 0x42, 0x29, 0xb6, 0x24, 0xf9, - 0x8a, 0x52, 0xab, 0xff, 0xa5, 0x00, 0x25, 0xac, 0xa7, 0xce, 0xc9, 0x82, 0x59, 0x39, 0xe8, 0x85, - 0xcc, 0x1c, 0xb4, 0x09, 0x65, 0xf4, 0x53, 0x9e, 0xc4, 0xc7, 0xf2, 0xfe, 0x0d, 0x88, 0x09, 0x89, - 0x0c, 0x14, 0x0f, 0x44, 0x12, 0xce, 0x83, 0xb1, 0x85, 0xc7, 0xa0, 0x45, 0x90, 0x59, 0xbc, 0x8a, - 0x5a, 0xf8, 0x22, 0x7e, 0x37, 0xad, 0xfa, 0x5f, 0x25, 0x50, 0xb1, 0x41, 0x4e, 0xfe, 0x83, 0xe2, - 0xcc, 0xfc, 0x3e, 0xc4, 0xf4, 0xb2, 0xf3, 0x7b, 0x44, 0x4f, 0xe4, 0xf7, 0xac, 0x2d, 0x19, 0xcb, - 0xdc, 0x92, 0x06, 0xcc, 0x08, 0xce, 0x78, 0x1d, 0xca, 0xc1, 0x07, 0x4e, 0x8a, 0xc1, 0x09, 0xd7, - 0x40, 0x68, 0x10, 0x78, 0x02, 0x03, 0x1e, 0x44, 0x72, 0x67, 0x80, 0x42, 0x26, 0xbc, 0x24, 0x67, - 0xc3, 0x4b, 0x97, 0xa1, 0x14, 0x15, 0xc4, 0x22, 0x63, 0x47, 0x03, 0x17, 0xfc, 0x3b, 0xc4, 0xe7, - 0xd1, 0xdf, 0x38, 0x58, 0x96, 0xe4, 0xf1, 0xb9, 0x8c, 0x75, 0xe8, 0xea, 0x29, 0x75, 0xed, 0x23, - 0x01, 0xa6, 0x06, 0x84, 0x45, 0x6e, 0xf1, 0x87, 0x8f, 0xd8, 0x10, 0xb5, 0x23, 0x7d, 0x14, 0x11, - 0x12, 0xa1, 0x24, 0x0f, 0x01, 0xb1, 0xce, 0x71, 0x06, 0xed, 0x4e, 0x5e, 0x14, 0xda, 0x65, 0x72, - 0x23, 0x9d, 0x43, 0x75, 0xa4, 0x73, 0x88, 0xfe, 0xc2, 0x53, 0x54, 0xe4, 0xfa, 0x1f, 0x0b, 0x30, - 0xcd, 0x77, 0x74, 0x1b, 0xf3, 0xe7, 0xf3, 0x72, 0xac, 0xcc, 0xcc, 0x3d, 0x96, 0xfd, 0x80, 0x9a, - 0xbd, 0x65, 0x52, 0xf6, 0x96, 0xd5, 0xbf, 0x2d, 0x00, 0xec, 0xe0, 0x43, 0xd4, 0xf3, 0xb2, 0x3d, - 0x59, 0x1b, 0x8e, 0xa5, 0x6b, 0xc3, 0x6c, 0x73, 0x8b, 0xd9, 0xe6, 0xa6, 0xfe, 0x40, 0xc5, 0x82, - 0x96, 0xac, 0x94, 0xea, 0x5f, 0x17, 0x40, 0xde, 0x3e, 0x20, 0xe6, 0x61, 0xd0, 0xef, 0xa6, 0x17, - 0x31, 0x3e, 0x5c, 0xc4, 0x5d, 0x98, 0xe8, 0x38, 0xc6, 0x91, 0xe7, 0xa3, 0xc9, 0xd5, 0x8d, 0x9b, - 0x67, 0xf7, 0x48, 0x42, 0xe3, 0x7d, 0x94, 0xd1, 0xb9, 0xec, 0xf0, 0x5f, 0x6c, 0x63, 0xd8, 0x46, - 0xb0, 0x8f, 0xad, 0x5f, 0x7d, 0xf7, 0x43, 0xed, 0xd2, 0xf7, 0x3f, 0xd4, 0x2e, 0xfd, 0xf4, 0x43, - 0xad, 0xf0, 0xf5, 0x49, 0xad, 0xf0, 0x87, 0x93, 0x5a, 0xe1, 0xcf, 0x27, 0xb5, 0xc2, 0x77, 0x27, - 0xb5, 0xc2, 0xdf, 0x4f, 0x6a, 0x85, 0x7f, 0x9c, 0xd4, 0x2e, 0xfd, 0x74, 0x52, 0x2b, 0x7c, 0xf3, - 0x63, 0xed, 0xd2, 0x77, 0x3f, 0xd6, 0x2e, 0x7d, 0xff, 0x63, 0xed, 0xd2, 0x17, 0xb7, 0xf7, 0xbd, - 0xa1, 0x0d, 0xb6, 0x77, 0xfa, 0x3f, 0x3c, 0xdf, 0x8d, 0x7d, 0xee, 0x4d, 0x60, 0xd0, 0xbc, 0xf5, - 0x9f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x89, 0x96, 0x35, 0x8a, 0x4d, 0x2c, 0x00, 0x00, + 0x66, 0x6a, 0x16, 0x59, 0x4c, 0xcd, 0x3a, 0xcb, 0xf9, 0x09, 0xf3, 0x07, 0x66, 0x3f, 0x8b, 0xd4, + 0xd4, 0xac, 0xa6, 0xb2, 0x9b, 0xec, 0x66, 0xa2, 0x6c, 0x66, 0x33, 0x35, 0xf9, 0x03, 0x53, 0x35, + 0xd5, 0xa7, 0xbb, 0x41, 0x00, 0x84, 0x24, 0xc8, 0x15, 0x2f, 0xb2, 0x23, 0xfa, 0x3c, 0xfa, 0x74, + 0xf7, 0xe9, 0xf3, 0xf8, 0x9a, 0x70, 0x2b, 0x24, 0xdd, 0x9e, 0xe7, 0x1b, 0xce, 0x5a, 0x40, 0xfc, + 0x23, 0xe2, 0xaf, 0x19, 0x3d, 0x7b, 0xad, 0x47, 0xfc, 0xc0, 0x0e, 0x42, 0xe2, 0x9a, 0x64, 0xed, + 0x68, 0x7d, 0x8d, 0x3c, 0x25, 0x66, 0x3f, 0xb4, 0x3d, 0x37, 0x68, 0xf4, 0x7c, 0x2f, 0xf4, 0xd4, + 0xba, 0x10, 0x6a, 0x30, 0xa1, 0x86, 0xd1, 0xb3, 0x1b, 0x31, 0xa1, 0xc6, 0xd1, 0xfa, 0x52, 0x6d, + 0xdf, 0xf3, 0xf6, 0x1d, 0xb2, 0x86, 0x12, 0x7b, 0xfd, 0xce, 0x9a, 0xd5, 0xf7, 0x0d, 0xaa, 0x84, + 0xe9, 0x58, 0x5a, 0x4e, 0xd3, 0x43, 0xbb, 0x4b, 0x82, 0xd0, 0xe8, 0xf6, 0x38, 0xc3, 0x55, 0x8b, + 0xf4, 0x88, 0x6b, 0x11, 0xd7, 0xb4, 0x49, 0xb0, 0xb6, 0xef, 0xed, 0x7b, 0x38, 0x8e, 0xbf, 0x38, + 0xcb, 0xb5, 0xc8, 0x78, 0x6a, 0xb5, 0xe9, 0x75, 0xbb, 0x9e, 0x4b, 0x0d, 0xee, 0x92, 0x20, 0x30, + 0xf6, 0x49, 0x26, 0x17, 0x71, 0xfb, 0xdd, 0x80, 0x32, 0x1d, 0x7b, 0xfe, 0x61, 0xc7, 0xf1, 0x8e, + 0x39, 0xd7, 0xf5, 0x04, 0x57, 0xc7, 0xb0, 0x9d, 0xbe, 0x4f, 0x46, 0x95, 0xbd, 0x9c, 0x60, 0x13, + 0x3a, 0x46, 0xf9, 0x5e, 0xcd, 0xda, 0x57, 0xd3, 0xf1, 0xcc, 0xc3, 0x51, 0xde, 0x1b, 0x59, 0xbc, + 0x91, 0x9d, 0x6c, 0x59, 0x9c, 0xf5, 0xb5, 0x33, 0x59, 0x53, 0x4b, 0x7a, 0xe5, 0x4c, 0xe6, 0xd0, + 0x08, 0x0e, 0x39, 0xe3, 0xcd, 0x2c, 0xc6, 0x03, 0x3b, 0x08, 0x3d, 0x7f, 0x30, 0x6a, 0xee, 0x5a, + 0x0e, 0x97, 0x79, 0xd2, 0x27, 0x7d, 0xc2, 0xdd, 0xa5, 0xfe, 0xa7, 0x22, 0x94, 0x76, 0x0e, 0x0c, + 0xdf, 0x6a, 0xba, 0x1d, 0x4f, 0x5d, 0x04, 0x39, 0xa0, 0x1f, 0x6d, 0xdb, 0xd2, 0x0a, 0x2b, 0x85, + 0xd5, 0x71, 0xbd, 0x88, 0xdf, 0x4d, 0x8b, 0x92, 0x7c, 0xc3, 0xdd, 0x27, 0x94, 0xf4, 0xc2, 0x4a, + 0x61, 0x75, 0x4c, 0x2f, 0xe2, 0x77, 0xd3, 0x52, 0x67, 0x61, 0xdc, 0x3b, 0x76, 0x89, 0xaf, 0x8d, + 0xad, 0x14, 0x56, 0x4b, 0x3a, 0xfb, 0x50, 0x6f, 0x82, 0x1a, 0x84, 0x9e, 0x43, 0xdc, 0x76, 0x60, + 0xbb, 0x26, 0x69, 0xfb, 0xc4, 0x25, 0xc7, 0xda, 0x04, 0x6a, 0x55, 0x18, 0x65, 0x87, 0x12, 0x74, + 0x3a, 0xae, 0x6e, 0x42, 0xb9, 0xdf, 0xb3, 0x8c, 0x90, 0xb4, 0xa9, 0xaf, 0x69, 0xc5, 0x95, 0xc2, + 0x6a, 0x79, 0x63, 0xa9, 0xc1, 0x1c, 0xb1, 0x21, 0x1c, 0xb1, 0xb1, 0x2b, 0x1c, 0x71, 0x4b, 0xfa, + 0xe6, 0x6f, 0xcb, 0x05, 0x1d, 0x98, 0x10, 0x1d, 0x56, 0xef, 0x42, 0xcd, 0x35, 0xba, 0x24, 0xe8, + 0x19, 0x26, 0x69, 0xbb, 0x5e, 0x68, 0x77, 0x6c, 0x13, 0xbd, 0xba, 0x7d, 0x44, 0x37, 0xc0, 0x73, + 0xb5, 0x12, 0xda, 0x7d, 0x39, 0xe2, 0x7a, 0x18, 0x63, 0xfa, 0x8c, 0xf1, 0xa8, 0xbf, 0x29, 0xc0, + 0xa2, 0x4f, 0x7a, 0x8e, 0x90, 0xb5, 0x9c, 0x27, 0x6d, 0xc3, 0x3c, 0x6c, 0x3b, 0xe4, 0x88, 0x38, + 0xda, 0xe4, 0xca, 0xd8, 0x6a, 0x79, 0xa3, 0xd9, 0x38, 0xff, 0x92, 0x35, 0xa2, 0x5d, 0x6d, 0xe8, + 0x43, 0x75, 0x77, 0x9d, 0x27, 0x9b, 0xe6, 0xe1, 0x03, 0xaa, 0xeb, 0x9e, 0x1b, 0xfa, 0x03, 0x7d, + 0xde, 0xcf, 0x24, 0xaa, 0x87, 0xa0, 0xe0, 0x39, 0x0d, 0xe7, 0x0e, 0x34, 0x05, 0x27, 0xdf, 0xbc, + 0xd8, 0xe4, 0x9f, 0x50, 0x2d, 0x42, 0x6d, 0xc0, 0x26, 0xad, 0x3e, 0x49, 0x0c, 0xaa, 0x06, 0x54, + 0xd8, 0x64, 0x41, 0x68, 0x84, 0x24, 0xd0, 0xa6, 0x71, 0xa2, 0xf7, 0x9e, 0x61, 0xa2, 0x1d, 0x54, + 0xc0, 0x66, 0x29, 0x3f, 0x19, 0x8e, 0x2c, 0x35, 0xe1, 0xc5, 0x33, 0xb6, 0x41, 0x55, 0x60, 0xec, + 0x90, 0x0c, 0xd0, 0xe7, 0x4a, 0x3a, 0xfd, 0x49, 0x9d, 0xea, 0xc8, 0x70, 0xfa, 0x84, 0x3b, 0x1b, + 0xfb, 0x78, 0xe7, 0x85, 0xb7, 0x0a, 0x4b, 0x21, 0xcc, 0x64, 0x2c, 0x2a, 0xae, 0x62, 0x9c, 0xa9, + 0xf8, 0x20, 0xae, 0xa2, 0xbc, 0xb1, 0x9e, 0x67, 0x3d, 0x09, 0xcd, 0xf1, 0x59, 0x5d, 0x50, 0xd2, + 0x2b, 0xcc, 0x98, 0xf2, 0x6e, 0x72, 0xca, 0x46, 0xee, 0x29, 0x51, 0x6d, 0x6c, 0xbe, 0x96, 0x24, + 0x4b, 0xca, 0x78, 0x4b, 0x92, 0xc7, 0x95, 0x89, 0x96, 0x24, 0xcb, 0x4a, 0xa9, 0x25, 0xc9, 0xa0, + 0x94, 0x5b, 0x92, 0x5c, 0x56, 0x2a, 0x2d, 0x49, 0xae, 0x28, 0x93, 0x2d, 0x49, 0xae, 0x2a, 0x53, + 0x2d, 0x49, 0x9e, 0x52, 0x94, 0xfa, 0xbf, 0x6b, 0x30, 0xf7, 0x98, 0xc7, 0x98, 0x7b, 0x22, 0x29, + 0xe0, 0xa5, 0xbe, 0x0a, 0x95, 0xe1, 0xbd, 0xe0, 0x17, 0xbb, 0xa4, 0x97, 0xa3, 0xb1, 0xa6, 0xa5, + 0x2e, 0x43, 0x59, 0xc4, 0x27, 0x71, 0xbf, 0x4b, 0x3a, 0x88, 0xa1, 0xa6, 0xa5, 0x36, 0x60, 0xa6, + 0x67, 0xf8, 0xc4, 0x0d, 0xdb, 0x09, 0x55, 0xec, 0xc2, 0x4f, 0x33, 0xd2, 0xc3, 0x98, 0xc2, 0x9b, + 0xa0, 0x72, 0xfe, 0xb8, 0x5e, 0x09, 0xd9, 0x15, 0x46, 0x79, 0x3c, 0xd4, 0x5e, 0x87, 0x49, 0xce, + 0xed, 0xf7, 0x5d, 0xca, 0x38, 0xce, 0x4c, 0x64, 0x83, 0x7a, 0xdf, 0x4d, 0x58, 0x60, 0xbb, 0x76, + 0x68, 0x1b, 0x21, 0xc1, 0x28, 0x35, 0x81, 0xde, 0xc1, 0x2d, 0x68, 0x0a, 0x4a, 0xd3, 0x52, 0xdf, + 0x86, 0x45, 0xd3, 0xeb, 0xf6, 0x1c, 0x82, 0xb7, 0x98, 0x1c, 0x51, 0xc9, 0x3d, 0x23, 0x34, 0x0f, + 0xa8, 0x54, 0x11, 0xa5, 0xe6, 0x87, 0x0c, 0xf7, 0x28, 0x7d, 0x8b, 0x92, 0x9b, 0x96, 0x7a, 0x05, + 0x80, 0x06, 0xe0, 0x36, 0xfa, 0x2f, 0x06, 0x8d, 0x92, 0x5e, 0xa2, 0x23, 0x78, 0x52, 0x74, 0x6d, + 0xd1, 0xa2, 0xc2, 0x41, 0x8f, 0xe0, 0x96, 0x68, 0xc0, 0xd6, 0x26, 0x28, 0xbb, 0x83, 0x1e, 0xa1, + 0x1b, 0xa2, 0x7e, 0x09, 0x4b, 0x11, 0x77, 0x94, 0xac, 0x31, 0xc8, 0x79, 0xfd, 0x50, 0x2b, 0xa3, + 0x9b, 0x2c, 0x8e, 0xc4, 0xb9, 0xbb, 0x3c, 0x21, 0x6f, 0x49, 0xbf, 0xa3, 0x61, 0x4e, 0x3b, 0x4e, + 0x9f, 0xec, 0x2e, 0x53, 0xa0, 0x7e, 0x02, 0xb3, 0x91, 0x7a, 0xba, 0x79, 0x42, 0x71, 0x25, 0x9f, + 0xe2, 0x68, 0x25, 0x7a, 0x3f, 0x52, 0xb9, 0x07, 0x57, 0x2c, 0xd2, 0x31, 0xfa, 0x4e, 0xec, 0xf0, + 0x70, 0x3f, 0x84, 0xee, 0xc9, 0x7c, 0xba, 0x97, 0xb8, 0x16, 0x71, 0xd0, 0xbb, 0x46, 0x70, 0x28, + 0xe6, 0x78, 0x0d, 0x54, 0xc7, 0x08, 0x42, 0x7e, 0x2e, 0xa8, 0xdd, 0xb6, 0xb4, 0x69, 0x3c, 0x96, + 0x29, 0x4a, 0xc1, 0x03, 0xa1, 0x12, 0x4d, 0x4b, 0x7d, 0x1d, 0x66, 0x90, 0xb9, 0x63, 0xfb, 0x91, + 0x88, 0x6d, 0x69, 0x2a, 0x72, 0x2b, 0x94, 0x74, 0x9f, 0x52, 0x50, 0xa4, 0x69, 0xa9, 0xff, 0x07, + 0x2f, 0x21, 0x7b, 0xd2, 0xf8, 0x20, 0x34, 0x7c, 0xea, 0x33, 0x91, 0xf8, 0x0c, 0x8a, 0xd7, 0x28, + 0x6b, 0xdc, 0xc2, 0x1d, 0xc6, 0x27, 0x94, 0xbd, 0x0f, 0x80, 0x92, 0x2c, 0x2d, 0xcd, 0xe6, 0x4c, + 0x4b, 0x25, 0x94, 0xc1, 0xac, 0xd4, 0x02, 0xb4, 0xb0, 0x1d, 0xcf, 0x6e, 0x73, 0x39, 0xd5, 0x54, + 0xa9, 0xe4, 0xa7, 0xc3, 0x0c, 0xb7, 0x01, 0x73, 0xc9, 0x45, 0x89, 0xc4, 0x36, 0x8f, 0x6b, 0x99, + 0x39, 0x8e, 0xad, 0x43, 0xe4, 0xb3, 0xfb, 0xb0, 0x92, 0xda, 0x08, 0xf3, 0x80, 0x58, 0x7d, 0x27, + 0xbe, 0x15, 0x0b, 0x2c, 0x2f, 0xc6, 0xc5, 0x77, 0x04, 0x97, 0xd8, 0x88, 0x2d, 0xa8, 0x9d, 0xb3, + 0xa1, 0x1a, 0x6a, 0x59, 0x3a, 0x3e, 0x7d, 0x33, 0x77, 0xd2, 0xf6, 0x0b, 0x8f, 0x5a, 0xcc, 0xe7, + 0x51, 0x89, 0x05, 0x0a, 0x57, 0x1a, 0xd9, 0x14, 0x23, 0xa4, 0x41, 0x37, 0xd4, 0x96, 0x30, 0x2c, + 0x27, 0x64, 0x36, 0x19, 0x29, 0x71, 0x29, 0x13, 0x8b, 0xc1, 0xe3, 0x79, 0x31, 0xe7, 0xf1, 0x2c, + 0x64, 0x2c, 0x15, 0xcf, 0xc9, 0x80, 0xcb, 0xa7, 0xed, 0x39, 0x4e, 0x70, 0x39, 0xe7, 0x04, 0x8b, + 0x99, 0x27, 0x82, 0x53, 0xdc, 0x00, 0xc5, 0x34, 0x5c, 0x93, 0x38, 0x6d, 0x9f, 0x3c, 0xe9, 0x93, + 0x20, 0x24, 0x96, 0x76, 0x65, 0xa5, 0xb0, 0x2a, 0xeb, 0x53, 0x6c, 0x5c, 0x17, 0xc3, 0xaa, 0x0f, + 0xd7, 0x93, 0xd6, 0x78, 0xbe, 0xbd, 0x6f, 0xbb, 0x86, 0x93, 0x36, 0xab, 0x96, 0xd3, 0xac, 0xab, + 0x71, 0xb3, 0x3e, 0xe6, 0xca, 0x92, 0xe6, 0xdd, 0x01, 0x2d, 0x39, 0x27, 0xb7, 0x92, 0xfa, 0xc9, + 0x32, 0x46, 0xca, 0xb9, 0xb8, 0x12, 0x6e, 0x6c, 0xd3, 0x52, 0x5f, 0x85, 0xe9, 0xe4, 0xba, 0xa8, + 0xc4, 0x0a, 0x4a, 0x24, 0x17, 0xc6, 0x78, 0x83, 0xd0, 0x36, 0x0f, 0x07, 0xed, 0x58, 0xb8, 0xbe, + 0xca, 0x78, 0x19, 0x61, 0x37, 0x0a, 0xda, 0xfb, 0xb0, 0xc2, 0x79, 0xc5, 0xa2, 0xdb, 0xa1, 0xd7, + 0x1e, 0x5e, 0x6d, 0xea, 0x85, 0xf5, 0x7c, 0x5e, 0x78, 0x99, 0x29, 0x12, 0x0b, 0xde, 0xf5, 0x76, + 0xc4, 0x65, 0xa7, 0xee, 0xa8, 0x41, 0x51, 0x38, 0xe0, 0x4b, 0xac, 0x82, 0xe6, 0x9f, 0xea, 0xa7, + 0x30, 0xef, 0x93, 0xd0, 0x1f, 0xf0, 0x04, 0xe6, 0xb4, 0x6d, 0x37, 0x24, 0xfe, 0x91, 0xe1, 0x68, + 0xd7, 0xf2, 0x4d, 0x3c, 0x8b, 0xe2, 0x2c, 0xc9, 0x39, 0x4d, 0x2e, 0x3c, 0x54, 0xdb, 0x35, 0x9e, + 0xda, 0xdd, 0x7e, 0x77, 0xa8, 0xf6, 0xfa, 0x45, 0xd4, 0x7e, 0xc4, 0xa4, 0x23, 0xb5, 0xb7, 0xd3, + 0x6a, 0xf9, 0x32, 0x02, 0xed, 0x65, 0x5c, 0x56, 0x42, 0x8a, 0xdf, 0xab, 0x40, 0x7d, 0x87, 0x16, + 0xcf, 0x54, 0x6a, 0xcf, 0x30, 0x0f, 0xbd, 0x4e, 0xa7, 0x6d, 0x7a, 0xa4, 0xd3, 0xb1, 0x4d, 0x9b, + 0xb8, 0xa1, 0xf6, 0xca, 0x4a, 0x61, 0xb5, 0xa0, 0x2f, 0x20, 0xc3, 0x16, 0xa3, 0x6f, 0x0f, 0xc9, + 0x6a, 0x17, 0xea, 0x19, 0x99, 0x92, 0x3c, 0xed, 0xd9, 0xcc, 0x5c, 0xe6, 0xa4, 0xab, 0x39, 0x9d, + 0x74, 0x79, 0x24, 0x65, 0xde, 0x8b, 0x34, 0xf1, 0x76, 0x61, 0x99, 0x99, 0xea, 0x7a, 0x6e, 0x1b, + 0x7f, 0x19, 0x7b, 0x0e, 0x69, 0x13, 0xdf, 0xf7, 0x7c, 0xcc, 0xeb, 0x81, 0x76, 0x63, 0x65, 0x6c, + 0xb5, 0xa4, 0xbf, 0x88, 0xc4, 0x87, 0x9e, 0xab, 0x0b, 0xa6, 0x7b, 0x94, 0x87, 0x66, 0xf8, 0x40, + 0x5d, 0x05, 0xe5, 0xc0, 0x08, 0x98, 0x7c, 0xbb, 0xe7, 0x39, 0xb6, 0x39, 0xd0, 0x5e, 0xc5, 0x7b, + 0x58, 0x3d, 0x30, 0x02, 0x94, 0x78, 0x84, 0xa3, 0xea, 0x4b, 0x30, 0x69, 0xfa, 0x9e, 0x1b, 0xf9, + 0x9f, 0xf6, 0x1a, 0x7a, 0x6a, 0x85, 0x0e, 0x0a, 0x5f, 0xa2, 0xb5, 0x5a, 0x60, 0xef, 0xd3, 0xbb, + 0x69, 0x7a, 0x7d, 0x37, 0xd4, 0x1a, 0x18, 0x53, 0xcb, 0x6c, 0x6c, 0x9b, 0x0e, 0xa9, 0x9f, 0xc0, + 0xb4, 0xd1, 0x0f, 0xbd, 0xb6, 0x4f, 0x02, 0x12, 0xb6, 0x7b, 0x9e, 0xed, 0x86, 0x81, 0x76, 0x0b, + 0x77, 0xe5, 0xfa, 0xb0, 0xdc, 0xa4, 0x75, 0x66, 0xd4, 0x72, 0x1e, 0xad, 0x37, 0x74, 0xca, 0xfd, + 0x08, 0x99, 0xf5, 0x29, 0x2a, 0x1f, 0x1b, 0x50, 0x7f, 0x0d, 0xd3, 0x01, 0x31, 0x7c, 0xf3, 0x80, + 0x1e, 0xb2, 0x6f, 0xef, 0xf5, 0x69, 0x13, 0x70, 0x1b, 0x9b, 0x80, 0x8f, 0xf3, 0x54, 0xb0, 0x99, + 0x75, 0x67, 0x63, 0x07, 0x55, 0x6e, 0x46, 0x1a, 0x59, 0x57, 0xa0, 0x04, 0xa9, 0x61, 0xf5, 0x31, + 0x48, 0x5d, 0xd2, 0xf5, 0xb4, 0x37, 0x71, 0xc2, 0xed, 0x67, 0x9f, 0xf0, 0x23, 0xd2, 0xf5, 0xd8, + 0x24, 0xa8, 0x50, 0xfd, 0x12, 0xa6, 0x79, 0x82, 0x6c, 0xb3, 0x86, 0xd9, 0x26, 0x81, 0xf6, 0x5f, + 0xb8, 0x53, 0x6f, 0x64, 0xce, 0xc2, 0xdb, 0x6a, 0x3a, 0x03, 0x4f, 0x9f, 0x1f, 0x0a, 0x39, 0x5d, + 0x39, 0x4a, 0x8d, 0xa8, 0xb7, 0x60, 0x9e, 0x57, 0x24, 0x91, 0xb3, 0xf2, 0xf2, 0xf5, 0x0e, 0x9e, + 0xec, 0x0c, 0x52, 0x23, 0x13, 0x59, 0x19, 0xfb, 0xff, 0x30, 0x35, 0x64, 0xa7, 0xed, 0x56, 0xa0, + 0xbd, 0x85, 0x16, 0x6d, 0xe4, 0x59, 0x77, 0xa4, 0x8c, 0xb6, 0x0b, 0x81, 0x5e, 0x25, 0x89, 0xef, + 0x44, 0xde, 0xa1, 0xa6, 0xa4, 0xef, 0xce, 0xdb, 0x17, 0xcd, 0x3b, 0x7a, 0x3f, 0x7d, 0x6b, 0x6e, + 0xc3, 0xc2, 0x48, 0x2d, 0x16, 0x3e, 0xc5, 0x55, 0xbf, 0xc3, 0x8a, 0x90, 0x64, 0x3d, 0xb6, 0xfb, + 0x94, 0xae, 0xfa, 0x36, 0xcc, 0x63, 0x6b, 0xd9, 0x0e, 0x7d, 0xc3, 0x0d, 0x6c, 0xb4, 0x88, 0x39, + 0xf8, 0xbb, 0x28, 0x34, 0x8b, 0xd4, 0xdd, 0x88, 0xc8, 0x3c, 0xfd, 0x03, 0xa8, 0x26, 0x2b, 0x66, + 0xed, 0xbf, 0x73, 0x2e, 0x60, 0x92, 0xc4, 0xeb, 0x64, 0x75, 0x0d, 0x66, 0x5d, 0x72, 0x3c, 0x7a, + 0x4e, 0xff, 0xc3, 0xda, 0x17, 0x97, 0x1c, 0xa7, 0x4e, 0xe9, 0x01, 0x54, 0x78, 0xb3, 0x81, 0xb0, + 0x90, 0xf6, 0x1e, 0xce, 0x7b, 0x23, 0xf3, 0x88, 0x90, 0x83, 0xb9, 0x8c, 0x19, 0x7a, 0xfe, 0x36, + 0xfd, 0x14, 0xad, 0x0b, 0x7e, 0xa8, 0x6f, 0x81, 0x36, 0xd2, 0xba, 0x88, 0xca, 0xed, 0x7d, 0xd6, + 0x89, 0xa4, 0xfa, 0x17, 0x51, 0xbc, 0xdd, 0x82, 0x79, 0xd3, 0xf1, 0x02, 0xbe, 0x6f, 0x1d, 0xe2, + 0x47, 0xa5, 0xf2, 0xff, 0xb2, 0xcd, 0x46, 0xea, 0x2e, 0x27, 0xf2, 0x72, 0xf9, 0x0e, 0x68, 0x4c, + 0xe8, 0xc8, 0x0e, 0xec, 0x3d, 0xdb, 0xb1, 0xc3, 0x41, 0x24, 0xb6, 0x89, 0x62, 0x73, 0x48, 0xff, + 0x2c, 0x22, 0x73, 0xc1, 0xf7, 0x01, 0xf8, 0x6c, 0x74, 0xaf, 0xb7, 0xf2, 0xd6, 0xba, 0xcc, 0x06, + 0xbb, 0x4b, 0x96, 0x2c, 0x98, 0xcb, 0xbc, 0xf4, 0x19, 0xed, 0xfd, 0x9b, 0xc9, 0x46, 0x79, 0x39, + 0x19, 0xb9, 0x38, 0xae, 0x76, 0xb4, 0xde, 0x78, 0x64, 0x0c, 0x1c, 0xcf, 0xb0, 0xe2, 0x9d, 0xf8, + 0xe7, 0x50, 0x8a, 0x6e, 0xfa, 0xcf, 0xaa, 0x39, 0xea, 0xb3, 0xa3, 0xae, 0xba, 0x25, 0xc9, 0x8a, + 0x32, 0xdd, 0x92, 0xe4, 0x9b, 0xca, 0xeb, 0x2d, 0x49, 0x7e, 0x5d, 0x69, 0xb4, 0x24, 0x79, 0x4d, + 0x79, 0xa3, 0x25, 0xc9, 0x6f, 0x28, 0xeb, 0x2d, 0x49, 0x5e, 0x57, 0x36, 0x5a, 0x92, 0xbc, 0xa1, + 0xdc, 0xaa, 0xdf, 0x82, 0x6a, 0xf2, 0x76, 0xd2, 0x58, 0xce, 0x03, 0x4a, 0x3b, 0xb0, 0xbf, 0x22, + 0x68, 0xe3, 0x98, 0x5e, 0xe6, 0x63, 0x3b, 0xf6, 0x57, 0xa4, 0xfe, 0xaf, 0x02, 0xcc, 0x8f, 0xc4, + 0x32, 0x84, 0x02, 0xb0, 0x10, 0xf2, 0x09, 0xbd, 0x33, 0xb1, 0x42, 0xa8, 0xc0, 0x0b, 0x21, 0x24, + 0x0c, 0x0b, 0xa1, 0x39, 0x98, 0xe0, 0x1e, 0xcd, 0x3a, 0xf7, 0x71, 0x1f, 0xbd, 0xb8, 0x05, 0xe3, + 0x78, 0xaf, 0xb0, 0x4d, 0xaf, 0x6e, 0xdc, 0xce, 0x74, 0x5f, 0xc4, 0x1c, 0x33, 0x63, 0x2a, 0x87, + 0x24, 0x50, 0x85, 0x7a, 0x1f, 0x26, 0xe8, 0x8f, 0x7e, 0x80, 0x4d, 0x7c, 0x35, 0x8e, 0x6c, 0x9c, + 0xaf, 0xa5, 0x1f, 0xe8, 0x5c, 0xba, 0xfe, 0x93, 0x04, 0x4a, 0xc2, 0x5f, 0x7f, 0x2e, 0x84, 0x62, + 0xb8, 0x07, 0x63, 0xf1, 0x3d, 0xd8, 0x86, 0x12, 0xeb, 0x34, 0x06, 0x3d, 0xc2, 0x4d, 0x7f, 0xf9, + 0xec, 0x7d, 0xc0, 0xde, 0x62, 0xd0, 0x23, 0xba, 0x1c, 0xf2, 0x5f, 0x6a, 0x03, 0x66, 0x42, 0xc3, + 0xdf, 0x27, 0x29, 0xf4, 0x83, 0xa1, 0x14, 0xd3, 0x8c, 0x94, 0x42, 0x3f, 0x38, 0x7f, 0xdc, 0xe6, + 0x09, 0x86, 0x10, 0x30, 0x4a, 0x12, 0xfd, 0xe0, 0xdc, 0x7c, 0x01, 0x45, 0xb6, 0x7c, 0x36, 0xc8, + 0x02, 0x52, 0x12, 0x92, 0x90, 0xd3, 0x90, 0xc4, 0xbb, 0xb0, 0xc4, 0x55, 0x98, 0x07, 0xb6, 0x63, + 0x0d, 0xa7, 0xf5, 0x5c, 0x67, 0x80, 0x08, 0x86, 0xac, 0x2f, 0x30, 0x8e, 0x6d, 0xca, 0x20, 0x66, + 0xff, 0xd8, 0x75, 0x06, 0x08, 0xd4, 0x8e, 0xf6, 0x84, 0xc0, 0xba, 0xeb, 0x20, 0xdd, 0x07, 0x6a, + 0x50, 0x14, 0xb1, 0xab, 0xcc, 0x60, 0x60, 0xfe, 0xa9, 0x2e, 0x40, 0x51, 0x84, 0x99, 0x0a, 0x52, + 0x26, 0x42, 0x16, 0x57, 0x9a, 0x30, 0x15, 0x0f, 0x45, 0x34, 0xb8, 0x4c, 0xe6, 0xed, 0x80, 0x87, + 0x82, 0x18, 0xc9, 0x6f, 0x82, 0x6a, 0x11, 0x87, 0x84, 0xa4, 0x6d, 0x74, 0x42, 0xe2, 0xb7, 0x31, + 0xf6, 0x68, 0x53, 0xb8, 0x40, 0x85, 0x51, 0x36, 0x29, 0x61, 0x9b, 0x8e, 0xb3, 0x9b, 0x5c, 0xff, + 0x83, 0x04, 0x33, 0x31, 0xec, 0xf1, 0x17, 0xe3, 0x75, 0xb1, 0x9d, 0x1e, 0x4f, 0xee, 0xf4, 0x35, + 0xa8, 0xa6, 0xb0, 0x10, 0x06, 0x83, 0x55, 0x3a, 0x71, 0x1c, 0xa4, 0x0e, 0x93, 0x2e, 0x79, 0x1a, + 0x63, 0x62, 0xa8, 0x57, 0x99, 0x0e, 0x0a, 0x9e, 0xec, 0xb3, 0x97, 0x4f, 0x39, 0xfb, 0xab, 0x50, + 0xd9, 0xf3, 0x0d, 0xd7, 0x3c, 0x68, 0x87, 0xde, 0x21, 0x61, 0x0e, 0x50, 0xd1, 0xcb, 0x6c, 0x6c, + 0x97, 0x0e, 0x89, 0x54, 0x4b, 0x37, 0x25, 0xc1, 0x3a, 0x89, 0xac, 0x34, 0xd5, 0xea, 0x7d, 0x77, + 0x2b, 0x26, 0x10, 0xf3, 0x9a, 0xa9, 0xf3, 0xbc, 0x46, 0x79, 0x46, 0xaf, 0xb9, 0x0c, 0x20, 0x8c, + 0xe2, 0x28, 0x53, 0x49, 0x97, 0x99, 0x29, 0x4d, 0xab, 0x25, 0xc9, 0x25, 0x05, 0x22, 0x74, 0x35, + 0xc2, 0x55, 0xeb, 0xff, 0x1c, 0x03, 0x35, 0x95, 0x23, 0x7f, 0xd9, 0x6e, 0x13, 0xdb, 0xea, 0x89, + 0xf3, 0xb6, 0xba, 0xf8, 0x8c, 0x5b, 0x9d, 0xac, 0x21, 0xe4, 0x0b, 0xd7, 0x10, 0x29, 0xc0, 0xad, + 0x74, 0x71, 0xc0, 0xed, 0xac, 0xf2, 0x07, 0xce, 0x28, 0x7f, 0xea, 0xdf, 0x4a, 0x30, 0x49, 0x35, + 0xfc, 0x72, 0xf2, 0xd2, 0x3d, 0xa8, 0x70, 0xec, 0x82, 0xe9, 0x19, 0x47, 0x3d, 0xf5, 0x53, 0x52, + 0x33, 0x47, 0x28, 0x50, 0x47, 0x39, 0x1c, 0x7e, 0xa8, 0x24, 0x86, 0xa0, 0x89, 0xbe, 0x1d, 0xf5, + 0x4d, 0xa0, 0xbe, 0xf5, 0x7c, 0x75, 0x03, 0xef, 0xe8, 0x51, 0x7d, 0x04, 0xba, 0xc5, 0x06, 0xe3, + 0x8e, 0x59, 0x4c, 0x3a, 0xe6, 0x0d, 0x88, 0x62, 0x4d, 0x84, 0xde, 0xc9, 0x88, 0x32, 0x4c, 0x89, + 0x71, 0x81, 0xdc, 0x2d, 0x82, 0x1c, 0x85, 0x29, 0xf6, 0x9c, 0x57, 0x24, 0x3c, 0x3a, 0xc5, 0xdc, + 0x1b, 0xce, 0x73, 0xef, 0xf2, 0x33, 0xba, 0x77, 0x3a, 0x02, 0x56, 0x46, 0x22, 0x60, 0xfd, 0xb7, + 0x55, 0xa8, 0x6c, 0x9a, 0xa1, 0x7d, 0x64, 0x87, 0x03, 0xf4, 0xa2, 0xd8, 0xba, 0x0b, 0xc9, 0x75, + 0xdf, 0x01, 0x2d, 0x1d, 0x7d, 0xa3, 0x27, 0x0a, 0xf6, 0xec, 0x35, 0x97, 0x8c, 0xc1, 0xe2, 0x85, + 0xe2, 0x03, 0xa8, 0xa6, 0xb0, 0x3b, 0x29, 0x6f, 0x67, 0x14, 0x24, 0x70, 0xba, 0x55, 0x50, 0x46, + 0x70, 0x5c, 0x16, 0x35, 0xaa, 0x41, 0x12, 0xbb, 0xdd, 0x86, 0x4a, 0x02, 0x24, 0xcd, 0x1b, 0x20, + 0xca, 0x41, 0x0c, 0x18, 0x5d, 0x86, 0xb2, 0xc1, 0xb7, 0x46, 0xe4, 0x99, 0x92, 0x0e, 0x62, 0x88, + 0xd5, 0x39, 0xb1, 0x72, 0x97, 0x3f, 0xbd, 0xf8, 0x51, 0xa1, 0xfb, 0x05, 0x2c, 0x9e, 0x0e, 0xdf, + 0x41, 0x3e, 0xb8, 0x6b, 0x3e, 0xc8, 0x06, 0xee, 0x52, 0xba, 0x87, 0x51, 0xec, 0x02, 0xef, 0x34, + 0x31, 0xdd, 0xdb, 0x22, 0xa2, 0x51, 0xdd, 0xbb, 0xd8, 0xff, 0x52, 0x5b, 0xd3, 0x8a, 0x73, 0xbe, + 0xd3, 0xcc, 0xb0, 0xf8, 0x96, 0xd4, 0xfa, 0x00, 0xa6, 0x0f, 0x88, 0xe1, 0x87, 0x7b, 0xc4, 0x08, + 0x2f, 0xfa, 0x38, 0xa3, 0x44, 0x92, 0x42, 0x5b, 0x16, 0xa2, 0x5c, 0xcd, 0x46, 0x94, 0x33, 0x41, + 0x5a, 0x96, 0xbd, 0xb3, 0x40, 0x5a, 0x6a, 0x9a, 0x1f, 0xe1, 0xec, 0xb4, 0x87, 0x50, 0xd8, 0xe5, + 0x0e, 0x45, 0xb4, 0x65, 0x4d, 0x42, 0x1c, 0x3b, 0x9d, 0x4e, 0x62, 0xa7, 0xc9, 0xfa, 0x57, 0x4d, + 0xd7, 0xbf, 0x37, 0x86, 0x6e, 0x6c, 0x5b, 0xc4, 0x0d, 0xed, 0x70, 0x80, 0xef, 0x3b, 0x08, 0x04, + 0xe3, 0x78, 0x93, 0x0f, 0x67, 0x02, 0x76, 0xb3, 0x99, 0x80, 0xdd, 0xe9, 0x78, 0xed, 0xdc, 0xf3, + 0xc1, 0x6b, 0xe7, 0x9f, 0x0f, 0x5e, 0xbb, 0x70, 0x06, 0x5e, 0xbb, 0x0b, 0x73, 0x4c, 0x2a, 0x0d, + 0x15, 0x69, 0x39, 0xaf, 0xf7, 0x0c, 0x8a, 0xa7, 0x40, 0xa2, 0x33, 0x51, 0xe0, 0xc5, 0xb3, 0x51, + 0xe0, 0x1c, 0xb0, 0xec, 0xd2, 0xf9, 0xb0, 0xec, 0x43, 0x50, 0x99, 0x16, 0x06, 0x56, 0xb1, 0x7f, + 0x0c, 0xf1, 0x87, 0x9d, 0x95, 0x64, 0x7e, 0xe4, 0x44, 0x9a, 0xca, 0xee, 0xb3, 0x9f, 0xba, 0x82, + 0xb2, 0x0f, 0x8c, 0x20, 0xe4, 0x23, 0xb4, 0xc1, 0x8a, 0xe9, 0xa3, 0xd9, 0x8d, 0xf8, 0x43, 0x57, + 0xbb, 0x8c, 0xae, 0xb6, 0x10, 0x49, 0x3d, 0x46, 0x7a, 0xe4, 0x72, 0xd9, 0x45, 0x76, 0xed, 0x94, + 0x22, 0xfb, 0x33, 0x98, 0xc7, 0x49, 0x86, 0x57, 0xdb, 0x22, 0xa1, 0x61, 0x3b, 0x01, 0x3e, 0x9c, + 0x8c, 0x98, 0x3f, 0x02, 0x68, 0x04, 0xfa, 0x2c, 0x95, 0xff, 0x50, 0x88, 0xdf, 0x65, 0xd2, 0xea, + 0x97, 0xb0, 0x94, 0xd2, 0x1b, 0x7f, 0x92, 0x5c, 0xc9, 0xfb, 0xe6, 0x95, 0xd0, 0x3d, 0x7c, 0x9b, + 0x6c, 0x49, 0xf2, 0x98, 0x22, 0xb5, 0x24, 0x79, 0x42, 0x29, 0xb6, 0x24, 0xf9, 0x8a, 0x52, 0xab, + 0xff, 0xa5, 0x00, 0x25, 0xac, 0xa7, 0xce, 0xc9, 0x82, 0x59, 0x39, 0xe8, 0x85, 0xcc, 0x1c, 0xb4, + 0x09, 0x65, 0xf4, 0x53, 0x9e, 0xc4, 0xc7, 0xf2, 0xfe, 0x49, 0x88, 0x09, 0x89, 0x0c, 0x14, 0x0f, + 0x44, 0x12, 0xce, 0x83, 0xb1, 0x85, 0xc7, 0xa0, 0x45, 0x90, 0x59, 0xbc, 0x8a, 0x1a, 0xfc, 0x22, + 0x7e, 0x37, 0xad, 0xfa, 0x5f, 0x25, 0x50, 0xb1, 0x7d, 0x4e, 0xfe, 0xbf, 0xe2, 0xcc, 0xfc, 0x3e, + 0x44, 0xfc, 0xb2, 0xf3, 0x7b, 0x44, 0x4f, 0xe4, 0xf7, 0xac, 0x2d, 0x19, 0xcb, 0xdc, 0x92, 0x06, + 0xcc, 0x08, 0xce, 0x78, 0x1d, 0xca, 0xa1, 0x09, 0x4e, 0x8a, 0x81, 0x0d, 0xd7, 0x40, 0x68, 0x10, + 0xed, 0x10, 0x83, 0x25, 0x44, 0x72, 0x67, 0x70, 0x43, 0x26, 0xf8, 0x24, 0x67, 0x83, 0x4f, 0x97, + 0xa1, 0x14, 0x15, 0xc4, 0x22, 0x63, 0x47, 0x03, 0x17, 0xfc, 0xb3, 0xc4, 0xe7, 0xd1, 0x9f, 0x3c, + 0x58, 0x96, 0xe4, 0xf1, 0xb9, 0x8c, 0x75, 0xe8, 0xea, 0x29, 0x75, 0xed, 0x23, 0x01, 0xb5, 0x06, + 0x84, 0x45, 0x6e, 0xf1, 0x77, 0x90, 0xd8, 0x10, 0xb5, 0x23, 0x7d, 0x14, 0x11, 0x4e, 0xa1, 0x24, + 0x0f, 0x01, 0x91, 0xd0, 0x71, 0x06, 0xfc, 0x4e, 0x5e, 0x14, 0xf8, 0x65, 0x72, 0x23, 0x9d, 0x43, + 0x75, 0xa4, 0x73, 0x88, 0xfe, 0xe0, 0x53, 0x54, 0xe4, 0xfa, 0x1f, 0x0b, 0x30, 0xcd, 0x77, 0x74, + 0x1b, 0xf3, 0xe7, 0xf3, 0x72, 0xac, 0xcc, 0xcc, 0x3d, 0x96, 0xfd, 0xbc, 0x9a, 0xbd, 0x65, 0x52, + 0xf6, 0x96, 0xd5, 0xbf, 0x2d, 0x00, 0xec, 0xe0, 0x33, 0xd5, 0xf3, 0xb2, 0x3d, 0x59, 0x1b, 0x8e, + 0xa5, 0x6b, 0xc3, 0x6c, 0x73, 0x8b, 0xd9, 0xe6, 0xa6, 0xfe, 0x5e, 0xc5, 0x82, 0x96, 0xac, 0x94, + 0xea, 0x5f, 0x17, 0x40, 0xde, 0x3e, 0x20, 0xe6, 0x61, 0xd0, 0xef, 0xa6, 0x17, 0x31, 0x3e, 0x5c, + 0xc4, 0x5d, 0x98, 0xe8, 0x38, 0xc6, 0x91, 0xe7, 0xa3, 0xc9, 0xd5, 0x8d, 0x9b, 0x67, 0xf7, 0x48, + 0x42, 0xe3, 0x7d, 0x94, 0xd1, 0xb9, 0xec, 0xf0, 0x3f, 0x6e, 0x63, 0xd8, 0x46, 0xb0, 0x8f, 0xad, + 0x5f, 0x7d, 0xf7, 0x43, 0xed, 0xd2, 0xf7, 0x3f, 0xd4, 0x2e, 0xfd, 0xf4, 0x43, 0xad, 0xf0, 0xf5, + 0x49, 0xad, 0xf0, 0xfb, 0x93, 0x5a, 0xe1, 0xcf, 0x27, 0xb5, 0xc2, 0x77, 0x27, 0xb5, 0xc2, 0xdf, + 0x4f, 0x6a, 0x85, 0x7f, 0x9c, 0xd4, 0x2e, 0xfd, 0x74, 0x52, 0x2b, 0x7c, 0xf3, 0x63, 0xed, 0xd2, + 0x77, 0x3f, 0xd6, 0x2e, 0x7d, 0xff, 0x63, 0xed, 0xd2, 0x17, 0xb7, 0xf7, 0xbd, 0xa1, 0x0d, 0xb6, + 0x77, 0xfa, 0xff, 0x3f, 0xdf, 0x8d, 0x7d, 0xee, 0x4d, 0x60, 0xd0, 0xbc, 0xf5, 0x9f, 0x00, 0x00, + 0x00, 0xff, 0xff, 0x5a, 0x6b, 0x55, 0x93, 0x6b, 0x2c, 0x00, 0x00, } func (this *ShardInfo) Equal(that interface{}) bool { @@ -2753,6 +2762,9 @@ func (this *ReplicationTaskInfo) Equal(that interface{}) bool { } else if !this.VisibilityTime.Equal(*that1.VisibilityTime) { return false } + if this.NewRunId != that1.NewRunId { + return false + } return true } func (this *VisibilityTaskInfo) Equal(that interface{}) bool { @@ -3438,7 +3450,7 @@ func (this *ReplicationTaskInfo) GoString() string { if this == nil { return "nil" } - s := make([]string, 0, 16) + s := make([]string, 0, 17) s = append(s, "&persistence.ReplicationTaskInfo{") s = append(s, "NamespaceId: "+fmt.Sprintf("%#v", this.NamespaceId)+",\n") s = append(s, "WorkflowId: "+fmt.Sprintf("%#v", this.WorkflowId)+",\n") @@ -3452,6 +3464,7 @@ func (this *ReplicationTaskInfo) GoString() string { s = append(s, "NewRunBranchToken: "+fmt.Sprintf("%#v", this.NewRunBranchToken)+",\n") s = append(s, "TaskId: "+fmt.Sprintf("%#v", this.TaskId)+",\n") s = append(s, "VisibilityTime: "+fmt.Sprintf("%#v", this.VisibilityTime)+",\n") + s = append(s, "NewRunId: "+fmt.Sprintf("%#v", this.NewRunId)+",\n") s = append(s, "}") return strings.Join(s, "") } @@ -4548,6 +4561,15 @@ func (m *ReplicationTaskInfo) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.NewRunId) > 0 { + i -= len(m.NewRunId) + copy(dAtA[i:], m.NewRunId) + i = encodeVarintExecutions(dAtA, i, uint64(len(m.NewRunId))) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0x8a + } if m.VisibilityTime != nil { n27, err27 := github_com_gogo_protobuf_types.StdTimeMarshalTo(*m.VisibilityTime, dAtA[i-github_com_gogo_protobuf_types.SizeOfStdTime(*m.VisibilityTime):]) if err27 != nil { @@ -5843,6 +5865,10 @@ func (m *ReplicationTaskInfo) Size() (n int) { l = github_com_gogo_protobuf_types.SizeOfStdTime(*m.VisibilityTime) n += 2 + l + sovExecutions(uint64(l)) } + l = len(m.NewRunId) + if l > 0 { + n += 2 + l + sovExecutions(uint64(l)) + } return n } @@ -6400,6 +6426,7 @@ func (this *ReplicationTaskInfo) String() string { `NewRunBranchToken:` + fmt.Sprintf("%v", this.NewRunBranchToken) + `,`, `TaskId:` + fmt.Sprintf("%v", this.TaskId) + `,`, `VisibilityTime:` + strings.Replace(fmt.Sprintf("%v", this.VisibilityTime), "Timestamp", "types.Timestamp", 1) + `,`, + `NewRunId:` + fmt.Sprintf("%v", this.NewRunId) + `,`, `}`, }, "") return s @@ -9955,6 +9982,38 @@ func (m *ReplicationTaskInfo) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 17: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field NewRunId", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowExecutions + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + stringLen |= uint64(b&0x7F) << shift + if b < 0x80 { + break + } + } + intStringLen := int(stringLen) + if intStringLen < 0 { + return ErrInvalidLengthExecutions + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthExecutions + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.NewRunId = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipExecutions(dAtA[iNdEx:]) diff --git a/common/persistence/serialization/task_serializer.go b/common/persistence/serialization/task_serializer.go index 3fa3e2688a5..e8c029e6cb4 100644 --- a/common/persistence/serialization/task_serializer.go +++ b/common/persistence/serialization/task_serializer.go @@ -1012,6 +1012,7 @@ func (s *TaskSerializer) replicationHistoryTaskToProto( NextEventId: historyTask.NextEventID, BranchToken: historyTask.BranchToken, NewRunBranchToken: historyTask.NewRunBranchToken, + NewRunId: historyTask.NewRunID, VisibilityTime: &historyTask.VisibilityTimestamp, } } @@ -1036,6 +1037,7 @@ func (s *TaskSerializer) replicationHistoryTaskFromProto( Version: historyTask.Version, BranchToken: historyTask.BranchToken, NewRunBranchToken: historyTask.NewRunBranchToken, + NewRunID: historyTask.NewRunId, } } diff --git a/proto/internal/temporal/server/api/persistence/v1/executions.proto b/proto/internal/temporal/server/api/persistence/v1/executions.proto index ddbcc9f2a88..9aa869a6935 100644 --- a/proto/internal/temporal/server/api/persistence/v1/executions.proto +++ b/proto/internal/temporal/server/api/persistence/v1/executions.proto @@ -192,6 +192,7 @@ message ReplicationTaskInfo { reserved 14; int64 task_id = 15; google.protobuf.Timestamp visibility_time = 16 [(gogoproto.stdtime) = true]; + string new_run_id = 17; } // visibility_task_data column diff --git a/service/history/replication/ack_manager.go b/service/history/replication/ack_manager.go index a10fb69708b..e4153d7e5e0 100644 --- a/service/history/replication/ack_manager.go +++ b/service/history/replication/ack_manager.go @@ -67,7 +67,7 @@ type ( currentClusterName string shard shard.Context config *configs.Config - historyCache workflow.Cache + workflowCache workflow.Cache executionMgr persistence.ExecutionManager metricsClient metrics.Client logger log.Logger @@ -88,7 +88,7 @@ var ( func NewAckManager( shard shard.Context, - historyCache workflow.Cache, + workflowCache workflow.Cache, executionMgr persistence.ExecutionManager, logger log.Logger, ) AckManager { @@ -104,7 +104,7 @@ func NewAckManager( currentClusterName: currentClusterName, shard: shard, config: shard.GetConfig(), - historyCache: historyCache, + workflowCache: workflowCache, executionMgr: executionMgr, metricsClient: shard.GetMetricsClient(), logger: log.With(logger, tag.ComponentReplicatorQueue), @@ -439,14 +439,9 @@ func (p *ackMgrImpl) generateHistoryReplicationTask( return nil, err } - // BranchToken will not set in get dlq replication message request - if len(taskInfo.BranchToken) == 0 { - taskInfo.BranchToken = branchToken - } - eventsBlob, err := p.getEventsBlob( ctx, - taskInfo.BranchToken, + branchToken, taskInfo.FirstEventID, taskInfo.NextEventID, ) @@ -454,12 +449,45 @@ func (p *ackMgrImpl) generateHistoryReplicationTask( return nil, err } + var newRunBranchToken []byte + if len(taskInfo.NewRunID) > 0 { + newRunContext, releaseFn, err := p.workflowCache.GetOrCreateWorkflowExecution( + ctx, + namespaceID, + commonpb.WorkflowExecution{ + WorkflowId: workflowID, + RunId: taskInfo.NewRunID, + }, + workflow.CallerTypeTask, + ) + if err != nil { + return nil, err + } + + newRunMutableState, err := newRunContext.LoadMutableState(ctx) + if err != nil { + releaseFn(err) + return nil, err + } + _, newRunBranchToken, err = getVersionHistoryItems( + newRunMutableState, + common.FirstEventID, + taskInfo.Version, + ) + if err != nil { + releaseFn(err) + return nil, err + } + releaseFn(nil) + } else if len(taskInfo.NewRunBranchToken) != 0 { + newRunBranchToken = taskInfo.NewRunBranchToken + } var newRunEventsBlob *commonpb.DataBlob - if len(taskInfo.NewRunBranchToken) != 0 { + if len(newRunBranchToken) > 0 { // only get the first batch newRunEventsBlob, err = p.getEventsBlob( ctx, - taskInfo.NewRunBranchToken, + newRunBranchToken, common.FirstEventID, common.FirstEventID+1, ) @@ -570,11 +598,11 @@ func (p *ackMgrImpl) processReplication( RunId: runID, } - context, release, err := p.historyCache.GetOrCreateWorkflowExecution( + context, release, err := p.workflowCache.GetOrCreateWorkflowExecution( ctx, namespaceID, execution, - workflow.CallerTypeAPI, + workflow.CallerTypeTask, ) if err != nil { return nil, err diff --git a/service/history/replication/ack_manager_test.go b/service/history/replication/ack_manager_test.go index 9d1ca7415ec..5dd84bcc9be 100644 --- a/service/history/replication/ack_manager_test.go +++ b/service/history/replication/ack_manager_test.go @@ -271,7 +271,7 @@ func (s *ackManagerSuite) TestSyncActivity_WorkflowCompleted() { ScheduledEventID: scheduledEventID, } - context, release, _ := s.replicationAckManager.historyCache.GetOrCreateWorkflowExecution( + context, release, _ := s.replicationAckManager.workflowCache.GetOrCreateWorkflowExecution( ctx, namespaceID, commonpb.WorkflowExecution{ @@ -323,7 +323,7 @@ func (s *ackManagerSuite) TestSyncActivity_ActivityCompleted() { ScheduledEventID: scheduledEventID, } - context, release, _ := s.replicationAckManager.historyCache.GetOrCreateWorkflowExecution( + context, release, _ := s.replicationAckManager.workflowCache.GetOrCreateWorkflowExecution( ctx, namespaceID, commonpb.WorkflowExecution{ @@ -378,7 +378,7 @@ func (s *ackManagerSuite) TestSyncActivity_ActivityRetry() { ScheduledEventID: scheduledEventID, } - context, release, _ := s.replicationAckManager.historyCache.GetOrCreateWorkflowExecution( + context, release, _ := s.replicationAckManager.workflowCache.GetOrCreateWorkflowExecution( ctx, namespaceID, commonpb.WorkflowExecution{ @@ -491,7 +491,7 @@ func (s *ackManagerSuite) TestSyncActivity_ActivityRunning() { ScheduledEventID: scheduledEventID, } - context, release, _ := s.replicationAckManager.historyCache.GetOrCreateWorkflowExecution( + context, release, _ := s.replicationAckManager.workflowCache.GetOrCreateWorkflowExecution( ctx, namespaceID, commonpb.WorkflowExecution{ diff --git a/service/history/tasks/history_replication_task.go b/service/history/tasks/history_replication_task.go index 54b5e0d81c7..7f8ab750d64 100644 --- a/service/history/tasks/history_replication_task.go +++ b/service/history/tasks/history_replication_task.go @@ -41,8 +41,11 @@ type ( FirstEventID int64 NextEventID int64 Version int64 - BranchToken []byte - NewRunBranchToken []byte + // deprecated + BranchToken []byte + // deprecated + NewRunBranchToken []byte + NewRunID string } ) diff --git a/service/history/timerQueueTaskExecutorBase.go b/service/history/timerQueueTaskExecutorBase.go index 993f1a4358e..d45bda23d2c 100644 --- a/service/history/timerQueueTaskExecutorBase.go +++ b/service/history/timerQueueTaskExecutorBase.go @@ -25,7 +25,6 @@ package history import ( - "bytes" "context" commonpb "go.temporal.io/api/common/v1" @@ -35,7 +34,6 @@ import ( "go.temporal.io/server/api/matchingservice/v1" "go.temporal.io/server/common" "go.temporal.io/server/common/log" - "go.temporal.io/server/common/log/tag" "go.temporal.io/server/common/metrics" "go.temporal.io/server/common/namespace" "go.temporal.io/server/common/persistence" @@ -133,17 +131,7 @@ func (t *timerQueueTaskExecutorBase) executeDeleteHistoryEventTask( return err } if ok := VerifyTaskVersion(t.shard, t.logger, mutableState.GetNamespaceEntry(), lastWriteVersion, task.Version, task); !ok { - currentBranchToken, err := mutableState.GetCurrentBranchToken() - if err != nil { - return err - } - // the mutable state has a newer version and the branch token is updated - // use task branch token to delete the original branch - if !bytes.Equal(task.BranchToken, currentBranchToken) { - return t.deleteHistoryBranch(ctx, task.BranchToken) - } - t.logger.Error("Different mutable state versions have the same branch token", tag.TaskVersion(task.Version), tag.LastEventVersion(lastWriteVersion)) - return serviceerror.NewInternal("Mutable state has different version but same branch token") + return nil } return t.deleteManager.DeleteWorkflowExecutionByRetention( diff --git a/service/history/workflow/context.go b/service/history/workflow/context.go index 15d6b2bb3e2..3c9c4e4165c 100644 --- a/service/history/workflow/context.go +++ b/service/history/workflow/context.go @@ -724,12 +724,12 @@ func (c *ContextImpl) mergeContinueAsNewReplicationTasks( newRunTask := newWorkflowSnapshot.Tasks[tasks.CategoryReplication][0].(*tasks.HistoryReplicationTask) delete(newWorkflowSnapshot.Tasks, tasks.CategoryReplication) - newRunBranchToken := newRunTask.BranchToken + newRunID := newRunTask.RunID taskUpdated := false for _, replicationTask := range currentWorkflowMutation.Tasks[tasks.CategoryReplication] { if task, ok := replicationTask.(*tasks.HistoryReplicationTask); ok { taskUpdated = true - task.NewRunBranchToken = newRunBranchToken + task.NewRunID = newRunID } } if !taskUpdated { diff --git a/service/history/workflow/task_generator.go b/service/history/workflow/task_generator.go index d87fa9b294a..4d90ef2dfd3 100644 --- a/service/history/workflow/task_generator.go +++ b/service/history/workflow/task_generator.go @@ -556,8 +556,6 @@ func (r *TaskGeneratorImpl) GenerateHistoryReplicationTasks( FirstEventID: firstEvent.GetEventId(), NextEventID: lastEvent.GetEventId() + 1, Version: version, - BranchToken: branchToken, - NewRunBranchToken: nil, }) return nil } @@ -589,8 +587,6 @@ func (r *TaskGeneratorImpl) GenerateMigrationTasks( FirstEventID: executionInfo.LastFirstEventId, NextEventID: lastItem.GetEventId() + 1, Version: lastItem.GetVersion(), - BranchToken: versionHistory.BranchToken, - NewRunBranchToken: nil, }, nil } } From d3ff841f5e9680ccd003d3917eb357d1ad38c174 Mon Sep 17 00:00:00 2001 From: yux0 Date: Fri, 30 Sep 2022 10:39:29 -0700 Subject: [PATCH 2/3] Separate ms lock --- service/history/replication/ack_manager.go | 129 +++++++++++++-------- 1 file changed, 80 insertions(+), 49 deletions(-) diff --git a/service/history/replication/ack_manager.go b/service/history/replication/ack_manager.go index e4153d7e5e0..b444f45f6a8 100644 --- a/service/history/replication/ack_manager.go +++ b/service/history/replication/ack_manager.go @@ -423,7 +423,7 @@ func (p *ackMgrImpl) generateHistoryReplicationTask( workflowID := taskInfo.WorkflowID runID := taskInfo.RunID taskID := taskInfo.TaskID - return p.processReplication( + replicationTask, err := p.processReplication( ctx, true, // still necessary to send out history replication message if workflow closed namespaceID, @@ -449,53 +449,6 @@ func (p *ackMgrImpl) generateHistoryReplicationTask( return nil, err } - var newRunBranchToken []byte - if len(taskInfo.NewRunID) > 0 { - newRunContext, releaseFn, err := p.workflowCache.GetOrCreateWorkflowExecution( - ctx, - namespaceID, - commonpb.WorkflowExecution{ - WorkflowId: workflowID, - RunId: taskInfo.NewRunID, - }, - workflow.CallerTypeTask, - ) - if err != nil { - return nil, err - } - - newRunMutableState, err := newRunContext.LoadMutableState(ctx) - if err != nil { - releaseFn(err) - return nil, err - } - _, newRunBranchToken, err = getVersionHistoryItems( - newRunMutableState, - common.FirstEventID, - taskInfo.Version, - ) - if err != nil { - releaseFn(err) - return nil, err - } - releaseFn(nil) - } else if len(taskInfo.NewRunBranchToken) != 0 { - newRunBranchToken = taskInfo.NewRunBranchToken - } - var newRunEventsBlob *commonpb.DataBlob - if len(newRunBranchToken) > 0 { - // only get the first batch - newRunEventsBlob, err = p.getEventsBlob( - ctx, - newRunBranchToken, - common.FirstEventID, - common.FirstEventID+1, - ) - if err != nil { - return nil, err - } - } - replicationTask := &replicationspb.ReplicationTask{ TaskType: enumsspb.REPLICATION_TASK_TYPE_HISTORY_V2_TASK, SourceTaskId: taskID, @@ -506,7 +459,7 @@ func (p *ackMgrImpl) generateHistoryReplicationTask( RunId: runID, VersionHistoryItems: versionHistoryItems, Events: eventsBlob, - NewRunEvents: newRunEventsBlob, + // NewRunEvents will be set in processNewRunReplication }, }, VisibilityTime: &taskInfo.VisibilityTimestamp, @@ -514,6 +467,18 @@ func (p *ackMgrImpl) generateHistoryReplicationTask( return replicationTask, nil }, ) + if err != nil { + return replicationTask, err + } + return p.processNewRunReplication( + ctx, + namespaceID, + workflowID, + taskInfo.NewRunID, + taskInfo.NewRunBranchToken, + taskInfo.Version, + replicationTask, + ) } func (p *ackMgrImpl) generateSyncWorkflowStateTask( @@ -624,6 +589,72 @@ func (p *ackMgrImpl) processReplication( } } +func (p *ackMgrImpl) processNewRunReplication( + ctx context.Context, + namespaceID namespace.ID, + workflowID string, + newRunID string, + branchToken []byte, + taskVersion int64, + task *replicationspb.ReplicationTask, +) (retReplicationTask *replicationspb.ReplicationTask, retError error) { + + attr, ok := task.Attributes.(*replicationspb.ReplicationTask_HistoryTaskAttributes) + if !ok { + return nil, serviceerror.NewInternal("Wrong replication task to process new run replication.") + } + + var newRunBranchToken []byte + if len(newRunID) > 0 { + newRunContext, releaseFn, err := p.workflowCache.GetOrCreateWorkflowExecution( + ctx, + namespaceID, + commonpb.WorkflowExecution{ + WorkflowId: workflowID, + RunId: newRunID, + }, + workflow.CallerTypeTask, + ) + if err != nil { + return nil, err + } + + newRunMutableState, err := newRunContext.LoadMutableState(ctx) + if err != nil { + releaseFn(err) + return nil, err + } + _, newRunBranchToken, err = getVersionHistoryItems( + newRunMutableState, + common.FirstEventID, + taskVersion, + ) + if err != nil { + releaseFn(err) + return nil, err + } + releaseFn(nil) + } else if len(branchToken) != 0 { + newRunBranchToken = branchToken + } + var newRunEventsBlob *commonpb.DataBlob + if len(newRunBranchToken) > 0 { + // only get the first batch + var err error + newRunEventsBlob, err = p.getEventsBlob( + ctx, + newRunBranchToken, + common.FirstEventID, + common.FirstEventID+1, + ) + if err != nil { + return nil, err + } + } + attr.HistoryTaskAttributes.NewRunEvents = newRunEventsBlob + return task, nil +} + func getVersionHistoryItems( mutableState workflow.MutableState, eventID int64, From 56227b1a9ce4fc414e11dc4eeed85e462afc2d5f Mon Sep 17 00:00:00 2001 From: yux0 Date: Wed, 5 Oct 2022 11:14:15 -0700 Subject: [PATCH 3/3] Add compatibility logic --- service/history/replication/ack_manager.go | 5 ++--- service/history/workflow/context.go | 2 ++ 2 files changed, 4 insertions(+), 3 deletions(-) diff --git a/service/history/replication/ack_manager.go b/service/history/replication/ack_manager.go index b444f45f6a8..9c40ec4a0e0 100644 --- a/service/history/replication/ack_manager.go +++ b/service/history/replication/ack_manager.go @@ -618,10 +618,10 @@ func (p *ackMgrImpl) processNewRunReplication( if err != nil { return nil, err } + defer func() { releaseFn(retError) }() newRunMutableState, err := newRunContext.LoadMutableState(ctx) if err != nil { - releaseFn(err) return nil, err } _, newRunBranchToken, err = getVersionHistoryItems( @@ -630,13 +630,12 @@ func (p *ackMgrImpl) processNewRunReplication( taskVersion, ) if err != nil { - releaseFn(err) return nil, err } - releaseFn(nil) } else if len(branchToken) != 0 { newRunBranchToken = branchToken } + var newRunEventsBlob *commonpb.DataBlob if len(newRunBranchToken) > 0 { // only get the first batch diff --git a/service/history/workflow/context.go b/service/history/workflow/context.go index 3c9c4e4165c..c52c2f2d0a0 100644 --- a/service/history/workflow/context.go +++ b/service/history/workflow/context.go @@ -724,11 +724,13 @@ func (c *ContextImpl) mergeContinueAsNewReplicationTasks( newRunTask := newWorkflowSnapshot.Tasks[tasks.CategoryReplication][0].(*tasks.HistoryReplicationTask) delete(newWorkflowSnapshot.Tasks, tasks.CategoryReplication) + newRunBranchToken := newRunTask.BranchToken newRunID := newRunTask.RunID taskUpdated := false for _, replicationTask := range currentWorkflowMutation.Tasks[tasks.CategoryReplication] { if task, ok := replicationTask.(*tasks.HistoryReplicationTask); ok { taskUpdated = true + task.NewRunBranchToken = newRunBranchToken task.NewRunID = newRunID } }