diff --git a/_utils/terror_gen/errors_release.txt b/_utils/terror_gen/errors_release.txt index 3b2f0e26ba..bbdc325377 100644 --- a/_utils/terror_gen/errors_release.txt +++ b/_utils/terror_gen/errors_release.txt @@ -390,8 +390,8 @@ ErrWorkerStartService,[code=40048:class=dm-worker:scope=internal:level=high],"st ErrWorkerNoStart,[code=40070:class=dm-worker:scope=internal:level=high],"worker has not started" ErrWorkerAlreadyClosed,[code=40049:class=dm-worker:scope=internal:level=high],"worker already closed" ErrWorkerAlreadyStart,[code=40071:class=dm-worker:scope=internal:level=high],"worker already started" -ErrWorkerNotRunningStage,[code=40050:class=dm-worker:scope=internal:level=high],"current stage is not running not valid" -ErrWorkerNotPausedStage,[code=40051:class=dm-worker:scope=internal:level=high],"current stage is not paused not valid" +ErrWorkerNotRunningStage,[code=40050:class=dm-worker:scope=internal:level=high],"current stage is %s but not running, invalid" +ErrWorkerNotPausedStage,[code=40051:class=dm-worker:scope=internal:level=high],"current stage is %s but not paused, invalid" ErrWorkerUpdateTaskStage,[code=40052:class=dm-worker:scope=internal:level=high],"can only update task on Paused stage, but current stage is %s" ErrWorkerMigrateStopRelay,[code=40053:class=dm-worker:scope=internal:level=high],"relay unit has stopped, can not be migrated" ErrWorkerSubTaskNotFound,[code=40054:class=dm-worker:scope=internal:level=high],"sub task with name %s not found" diff --git a/dm/pb/dmworker.pb.go b/dm/pb/dmworker.pb.go index 7ae7cc0a59..588967521c 100644 --- a/dm/pb/dmworker.pb.go +++ b/dm/pb/dmworker.pb.go @@ -126,6 +126,8 @@ const ( Stage_Paused Stage = 3 Stage_Stopped Stage = 4 Stage_Finished Stage = 5 + Stage_Pausing Stage = 6 + Stage_Resuming Stage = 7 ) var Stage_name = map[int32]string{ @@ -135,6 +137,8 @@ var Stage_name = map[int32]string{ 3: "Paused", 4: "Stopped", 5: "Finished", + 6: "Pausing", + 7: "Resuming", } var Stage_value = map[string]int32{ @@ -144,6 +148,8 @@ var Stage_value = map[string]int32{ "Paused": 3, "Stopped": 4, "Finished": 5, + "Pausing": 6, + "Resuming": 7, } func (x Stage) String() string { @@ -2827,134 +2833,135 @@ func init() { func init() { proto.RegisterFile("dmworker.proto", fileDescriptor_51a1b9e17fd67b10) } var fileDescriptor_51a1b9e17fd67b10 = []byte{ - // 2032 bytes of a gzipped FileDescriptorProto + // 2044 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xb4, 0x58, 0xcd, 0x6f, 0xe4, 0x48, - 0x15, 0x6f, 0xbb, 0x3f, 0xd2, 0xfd, 0xba, 0x93, 0x71, 0x2a, 0xd9, 0x6c, 0x4f, 0xb3, 0xdb, 0xb4, - 0x3c, 0xab, 0xdd, 0x6c, 0x0e, 0x11, 0x1b, 0x40, 0x48, 0x48, 0x0b, 0x6c, 0x3a, 0xd9, 0x99, 0x40, - 0x67, 0x26, 0x71, 0x67, 0xe0, 0x88, 0x1c, 0xbb, 0xd2, 0xb1, 0xd2, 0x6d, 0x7b, 0xfc, 0x91, 0x28, - 0xff, 0x04, 0x70, 0xe1, 0x80, 0xe0, 0x86, 0x10, 0x17, 0xc4, 0xbf, 0x01, 0xc7, 0x3d, 0x72, 0x03, - 0xcd, 0xfc, 0x1b, 0x1c, 0xd0, 0x7b, 0x55, 0xb6, 0xcb, 0xe9, 0x8f, 0x99, 0x91, 0xd8, 0x9b, 0xdf, - 0x47, 0x3d, 0xbf, 0xfa, 0xbd, 0x8f, 0xaa, 0x7a, 0xb0, 0xe1, 0xce, 0xee, 0x82, 0xe8, 0x86, 0x47, - 0xfb, 0x61, 0x14, 0x24, 0x01, 0xd3, 0xc3, 0x4b, 0xf3, 0x73, 0xd8, 0x1a, 0x27, 0x76, 0x94, 0x8c, - 0xd3, 0xcb, 0x0b, 0x3b, 0xbe, 0xb1, 0xf8, 0xab, 0x94, 0xc7, 0x09, 0x63, 0x50, 0x4b, 0xec, 0xf8, - 0xa6, 0xab, 0x0d, 0xb4, 0xdd, 0x96, 0x45, 0xdf, 0xe6, 0x3e, 0xb0, 0x97, 0xa1, 0x6b, 0x27, 0xdc, - 0xe2, 0x53, 0xfb, 0x3e, 0xd3, 0xec, 0xc2, 0x9a, 0x13, 0xf8, 0x09, 0xf7, 0x13, 0xa9, 0x9c, 0x91, - 0xe6, 0x18, 0xb6, 0x4e, 0xbd, 0x49, 0xf4, 0x70, 0x41, 0x1f, 0xe0, 0xd0, 0xf3, 0xa7, 0xc1, 0xe4, - 0xb9, 0x3d, 0xe3, 0x72, 0x8d, 0xc2, 0x61, 0x1f, 0x41, 0x4b, 0x50, 0x67, 0x41, 0xdc, 0xd5, 0x07, - 0xda, 0xee, 0xba, 0x55, 0x30, 0xcc, 0xa7, 0xf0, 0xc1, 0x8b, 0x90, 0xa3, 0xd1, 0x07, 0x1e, 0xf7, - 0x40, 0x0f, 0x42, 0x32, 0xb7, 0x71, 0x00, 0xfb, 0xe1, 0xe5, 0x3e, 0x0a, 0x5f, 0x84, 0x96, 0x1e, - 0x84, 0xb8, 0x1b, 0x1f, 0x7f, 0xa6, 0x8b, 0xdd, 0xe0, 0xb7, 0x79, 0x0b, 0x3b, 0x0f, 0x0d, 0xc5, - 0x61, 0xe0, 0xc7, 0x7c, 0xa5, 0xa5, 0x1d, 0x68, 0x44, 0x3c, 0x4e, 0xa7, 0x09, 0xd9, 0x6a, 0x5a, - 0x92, 0x42, 0x7e, 0x1c, 0xa4, 0x91, 0xc3, 0xbb, 0x55, 0xfa, 0x87, 0xa4, 0x98, 0x01, 0xd5, 0x59, - 0x3c, 0xe9, 0xd6, 0x88, 0x89, 0x9f, 0xe6, 0x1e, 0x6c, 0x0b, 0x14, 0xdf, 0x01, 0xf1, 0x5d, 0x60, - 0xe7, 0x29, 0x8f, 0xee, 0xc7, 0x89, 0x9d, 0xa4, 0xb1, 0xa2, 0xe9, 0x17, 0xd0, 0x89, 0xdd, 0x7c, - 0x06, 0x9b, 0xa4, 0x79, 0x1c, 0x45, 0x41, 0xb4, 0x4a, 0xf1, 0x8f, 0x1a, 0x74, 0x9f, 0xd9, 0xbe, - 0x3b, 0xcd, 0xfe, 0x3f, 0x3e, 0x1f, 0xad, 0xb2, 0xcc, 0x1e, 0x13, 0x1a, 0x3a, 0xa1, 0xd1, 0x42, - 0x34, 0xc6, 0xe7, 0xa3, 0x02, 0x56, 0x3b, 0x9a, 0xc4, 0xdd, 0xea, 0xa0, 0x8a, 0xea, 0xf8, 0x8d, - 0xd1, 0xbb, 0xcc, 0xa3, 0x27, 0xb6, 0x5d, 0x30, 0x30, 0xf6, 0xf1, 0xab, 0xe9, 0x99, 0x9d, 0x24, - 0x3c, 0xf2, 0xbb, 0x75, 0x11, 0xfb, 0x82, 0x63, 0x86, 0xb0, 0x3d, 0x0c, 0x66, 0xb3, 0xc0, 0xff, - 0x15, 0xe5, 0x69, 0x1e, 0x92, 0x02, 0x76, 0xad, 0x04, 0xbb, 0x84, 0x57, 0xcf, 0xe1, 0x5d, 0x1a, - 0x88, 0x1d, 0x68, 0x88, 0xdc, 0x97, 0x4e, 0x49, 0xca, 0xfc, 0xbb, 0x06, 0x5b, 0x25, 0x8c, 0xdf, - 0xfb, 0x8f, 0x3f, 0x80, 0x8e, 0xf8, 0x87, 0xb0, 0x40, 0xff, 0x6d, 0x1f, 0x18, 0x04, 0x95, 0xc2, - 0xb7, 0x4a, 0x5a, 0xec, 0x47, 0xb0, 0x1e, 0xcb, 0x00, 0x88, 0x65, 0xb5, 0x41, 0x75, 0xb7, 0x7d, - 0xb0, 0x49, 0xcb, 0x54, 0x81, 0x55, 0xd6, 0x33, 0xff, 0xaa, 0xc9, 0xa4, 0x90, 0xa1, 0x7e, 0x6f, - 0x7f, 0xbf, 0x80, 0xb6, 0xf0, 0x8b, 0x0c, 0x48, 0x77, 0x1f, 0x15, 0xee, 0x0a, 0xbb, 0xaa, 0x0e, - 0x6d, 0x51, 0x38, 0x21, 0xd6, 0x08, 0x5f, 0x0d, 0xc5, 0x57, 0xb1, 0xa8, 0xa4, 0x65, 0xfe, 0x45, - 0x83, 0xf6, 0xf0, 0x9a, 0x3b, 0xd2, 0x73, 0x74, 0x31, 0xb4, 0xe3, 0x98, 0xbb, 0x99, 0x8b, 0x82, - 0x62, 0xdb, 0x50, 0x4f, 0x82, 0xc4, 0x9e, 0x92, 0x93, 0x75, 0x4b, 0x10, 0x94, 0x2a, 0xa9, 0xe3, - 0xf0, 0x38, 0xbe, 0x4a, 0xa7, 0xe4, 0x65, 0xdd, 0x52, 0x38, 0x68, 0xed, 0xca, 0xf6, 0xa6, 0xdc, - 0xa5, 0x80, 0xd6, 0x2d, 0x49, 0x61, 0x3f, 0xba, 0xb3, 0x23, 0xdf, 0xf3, 0x27, 0x94, 0x5f, 0x75, - 0x2b, 0x23, 0x71, 0x85, 0xcb, 0x13, 0xdb, 0x9b, 0x76, 0x1b, 0x03, 0x6d, 0xb7, 0x63, 0x49, 0xca, - 0xec, 0x00, 0x1c, 0xa5, 0xb3, 0x50, 0xe2, 0xfb, 0x1b, 0x0d, 0x60, 0x14, 0xd8, 0xae, 0x74, 0xfa, - 0x13, 0x58, 0xbf, 0xf2, 0x7c, 0x2f, 0xbe, 0xe6, 0xee, 0xe1, 0x7d, 0xc2, 0x63, 0xf2, 0xbd, 0x6a, - 0x95, 0x99, 0xe8, 0x2c, 0x79, 0x2d, 0x54, 0x74, 0x52, 0x51, 0x38, 0xac, 0x07, 0xcd, 0x30, 0x0a, - 0x26, 0x11, 0x8f, 0x63, 0x99, 0x97, 0x39, 0x8d, 0x6b, 0x67, 0x3c, 0xb1, 0x45, 0x8b, 0x93, 0xd9, - 0xa9, 0x70, 0xcc, 0xdf, 0x6b, 0xb0, 0x3e, 0xbe, 0xb6, 0x23, 0xd7, 0xf3, 0x27, 0x4f, 0xa3, 0x20, - 0xa5, 0x26, 0x94, 0xd8, 0xd1, 0x84, 0x67, 0x1d, 0x57, 0x52, 0x58, 0x8f, 0x47, 0x47, 0x23, 0xfc, - 0x3f, 0xd5, 0x23, 0x7e, 0x0b, 0xff, 0xa3, 0x38, 0x19, 0x05, 0x8e, 0x9d, 0x78, 0x81, 0x2f, 0x7f, - 0x5f, 0x66, 0x52, 0xd5, 0xdc, 0xfb, 0x0e, 0x81, 0x59, 0xa5, 0xaa, 0x21, 0x0a, 0xfd, 0x4e, 0x7d, - 0x29, 0xa9, 0x93, 0x24, 0xa7, 0xcd, 0x3f, 0x57, 0x01, 0xc6, 0xf7, 0xbe, 0x23, 0x81, 0x1a, 0x40, - 0x9b, 0x36, 0x7c, 0x7c, 0xcb, 0xfd, 0x24, 0x83, 0x49, 0x65, 0xa1, 0x31, 0x22, 0x2f, 0xc2, 0x0c, - 0xa2, 0x9c, 0xc6, 0xb6, 0x11, 0x71, 0x87, 0xfb, 0x09, 0x0a, 0xab, 0x24, 0x2c, 0x18, 0xcc, 0x84, - 0xce, 0xcc, 0x8e, 0x13, 0x1e, 0x95, 0x40, 0x2a, 0xf1, 0xd8, 0x1e, 0x18, 0x2a, 0xfd, 0x34, 0xf1, - 0x5c, 0xd9, 0x60, 0xe6, 0xf8, 0x68, 0x8f, 0x36, 0x91, 0xd9, 0x6b, 0x08, 0x7b, 0x2a, 0x0f, 0xed, - 0xa9, 0x34, 0xd9, 0x5b, 0x13, 0xf6, 0x1e, 0xf2, 0xd1, 0xde, 0xe5, 0x34, 0x70, 0x6e, 0x3c, 0x7f, - 0x42, 0x01, 0x68, 0x12, 0x54, 0x25, 0x1e, 0xfb, 0x12, 0x8c, 0xd4, 0x8f, 0x78, 0x1c, 0x4c, 0x6f, - 0xb9, 0x4b, 0x71, 0x8c, 0xbb, 0x2d, 0xa5, 0xe6, 0xd5, 0x08, 0x5b, 0x73, 0xaa, 0x4a, 0x84, 0x40, - 0x14, 0x8f, 0x8c, 0x50, 0x1f, 0x40, 0xb4, 0xd7, 0x8b, 0xfb, 0x90, 0x77, 0xdb, 0x22, 0x7b, 0x0a, - 0x8e, 0xf9, 0x27, 0x0d, 0x3a, 0x6a, 0x1b, 0x52, 0x1a, 0xa4, 0xb6, 0xa4, 0x41, 0xea, 0x6a, 0x83, - 0x64, 0x9f, 0xe7, 0x8d, 0x45, 0x74, 0x0a, 0xf2, 0xf6, 0x2c, 0x0a, 0xb0, 0x0e, 0x2d, 0x12, 0xe4, - 0xbd, 0xe6, 0x0b, 0x68, 0x47, 0x78, 0xd2, 0xe7, 0x1d, 0x2d, 0xef, 0x2c, 0x56, 0xc1, 0xb6, 0x54, - 0x1d, 0xf3, 0x1f, 0x3a, 0xb4, 0x15, 0xe1, 0x5c, 0xa4, 0xb5, 0x77, 0x8c, 0xb4, 0xbe, 0x24, 0xd2, - 0x83, 0xcc, 0xa5, 0xf4, 0xf2, 0xc8, 0x8b, 0x64, 0xf2, 0xab, 0xac, 0x5c, 0xa3, 0x94, 0x5a, 0x2a, - 0x8b, 0xed, 0xc2, 0x23, 0x85, 0x54, 0x12, 0xeb, 0x21, 0x9b, 0xed, 0x03, 0x23, 0xd6, 0xd0, 0x4e, - 0x9c, 0xeb, 0x97, 0xe1, 0x29, 0x79, 0x43, 0xd9, 0xd5, 0xb4, 0x16, 0x48, 0xd8, 0x77, 0xa1, 0x1e, - 0x27, 0xf6, 0x84, 0x53, 0x62, 0x65, 0xc7, 0x2b, 0x32, 0x2c, 0xc1, 0x57, 0xc0, 0x6f, 0xbe, 0x05, - 0x7c, 0xf3, 0xbf, 0x3a, 0xac, 0x97, 0x0e, 0x8e, 0x85, 0xa7, 0x79, 0xfe, 0x47, 0x7d, 0xc9, 0x1f, - 0x07, 0x50, 0x4b, 0x7d, 0x4f, 0x04, 0x7b, 0xe3, 0xa0, 0x83, 0xf2, 0x97, 0xbe, 0x97, 0x60, 0x2e, - 0x59, 0x24, 0x51, 0x7c, 0xaa, 0xbd, 0x2d, 0x21, 0xbe, 0x07, 0x5b, 0x45, 0x22, 0x1f, 0x1d, 0x8d, - 0x46, 0x81, 0x73, 0x73, 0x72, 0x24, 0xd1, 0x5b, 0x24, 0x62, 0x4c, 0x1c, 0x57, 0x54, 0x90, 0xcf, - 0x2a, 0xe2, 0xc0, 0xfa, 0x0c, 0xea, 0x0e, 0x1e, 0x23, 0x84, 0x92, 0x4c, 0x28, 0xe5, 0x5c, 0x79, - 0x56, 0xb1, 0x84, 0x9c, 0x7d, 0x02, 0x35, 0x37, 0x9d, 0x85, 0x12, 0xab, 0x0d, 0xd4, 0x2b, 0x1a, - 0xfb, 0xb3, 0x8a, 0x45, 0x52, 0xd4, 0x9a, 0x06, 0xb6, 0xdb, 0x6d, 0x15, 0x5a, 0x45, 0xbf, 0x47, - 0x2d, 0x94, 0xa2, 0x16, 0x56, 0x18, 0x55, 0x9b, 0xd4, 0x2a, 0x9a, 0x1d, 0x6a, 0xa1, 0xf4, 0xb0, - 0x09, 0x8d, 0x58, 0x24, 0xf2, 0x4f, 0x60, 0xb3, 0x84, 0xfe, 0xc8, 0x8b, 0x09, 0x2a, 0x21, 0xee, - 0x6a, 0xcb, 0x4e, 0xf7, 0x6c, 0x7d, 0x1f, 0x80, 0xf6, 0x24, 0x0e, 0x5c, 0x79, 0x6a, 0x6b, 0xc5, - 0xb5, 0xf1, 0x63, 0x68, 0xe1, 0x5e, 0x56, 0x88, 0x71, 0x13, 0xcb, 0xc4, 0x21, 0x74, 0xc8, 0xfb, - 0xf3, 0xd1, 0x12, 0x0d, 0x76, 0x00, 0xdb, 0xe2, 0x00, 0xcd, 0xaf, 0xda, 0x1e, 0x1d, 0x17, 0xa2, - 0xb0, 0x16, 0xca, 0xb0, 0xa1, 0x73, 0x34, 0x37, 0x3e, 0x1f, 0x65, 0xa7, 0x5a, 0x46, 0x9b, 0x3f, - 0x84, 0x16, 0xfe, 0x51, 0xfc, 0x6e, 0x17, 0x1a, 0x24, 0xc8, 0x70, 0x30, 0x72, 0x38, 0xa5, 0x43, - 0x96, 0x94, 0x9b, 0xbf, 0xd5, 0x4a, 0xb7, 0x93, 0xf7, 0xee, 0x56, 0x83, 0xf9, 0xcb, 0x4d, 0xab, - 0x7c, 0x97, 0xd9, 0x07, 0xa0, 0x86, 0x93, 0xdd, 0x64, 0xf2, 0xf0, 0x16, 0x5c, 0x4b, 0xd1, 0xc0, - 0xc0, 0x14, 0xd4, 0x02, 0x68, 0xff, 0xa0, 0x43, 0x47, 0xbd, 0x04, 0x7d, 0x5b, 0x65, 0xc7, 0x94, - 0x97, 0x44, 0x56, 0x19, 0x9f, 0x66, 0x95, 0x51, 0x2f, 0xb6, 0x51, 0x64, 0x51, 0x51, 0x18, 0x4f, - 0x64, 0x61, 0x34, 0x48, 0x6d, 0x3d, 0x2b, 0x8c, 0x4c, 0x4b, 0xd4, 0xc5, 0x13, 0x59, 0x17, 0x6b, - 0x85, 0x52, 0x9e, 0x52, 0x79, 0x59, 0x3c, 0x91, 0x65, 0xd1, 0x2c, 0x94, 0xf2, 0x30, 0xe7, 0x55, - 0xb1, 0x06, 0x75, 0x0a, 0xa7, 0xf9, 0x63, 0x30, 0x54, 0x68, 0xa8, 0x26, 0x3e, 0x95, 0xc2, 0x52, - 0x2a, 0xa8, 0x97, 0x48, 0xb9, 0xf6, 0x15, 0xac, 0x97, 0x9a, 0x0a, 0x9e, 0x74, 0x5e, 0x3c, 0xb4, - 0x7d, 0x87, 0x4f, 0xf3, 0x2b, 0xa4, 0xc2, 0x51, 0x92, 0x4c, 0x2f, 0x2c, 0x4b, 0x13, 0xa5, 0x24, - 0x53, 0x2e, 0x82, 0xd5, 0xd2, 0x45, 0xf0, 0x6f, 0x1a, 0x34, 0x2e, 0x44, 0x10, 0xbb, 0xb0, 0x76, - 0x1c, 0x45, 0xc3, 0xc0, 0x15, 0x71, 0xac, 0x5b, 0x19, 0x89, 0x49, 0x8f, 0x9f, 0x53, 0x3b, 0x8e, - 0xe5, 0x85, 0x35, 0xa7, 0xa5, 0x6c, 0xec, 0x04, 0x21, 0x97, 0x37, 0xd6, 0x9c, 0x96, 0xb2, 0x11, - 0xbf, 0xe5, 0x53, 0x79, 0x63, 0xcd, 0x69, 0xfc, 0xdb, 0x29, 0x8f, 0x63, 0x4c, 0x10, 0xd1, 0x1b, - 0x33, 0x12, 0x57, 0x59, 0xf6, 0xdd, 0xd0, 0x4e, 0x63, 0x2e, 0x6f, 0x29, 0x39, 0x6d, 0x1e, 0x42, - 0x47, 0xdd, 0xde, 0x82, 0xa2, 0x1e, 0x64, 0x58, 0xeb, 0x14, 0x2e, 0xf1, 0x98, 0x2d, 0xa1, 0xdc, - 0x83, 0xee, 0xf8, 0xce, 0x4b, 0x9c, 0x6b, 0xca, 0x71, 0x71, 0x2c, 0xc9, 0xd7, 0xa0, 0x79, 0x00, - 0x5b, 0xf2, 0x85, 0x5c, 0x7a, 0xbf, 0x7f, 0x47, 0x79, 0x1e, 0xb7, 0xf3, 0xc2, 0x11, 0x4f, 0x42, - 0x33, 0x85, 0xed, 0xf2, 0x1a, 0xf9, 0x3c, 0x59, 0xb5, 0xe8, 0xff, 0xf0, 0xa8, 0xbe, 0x83, 0xcd, - 0xb3, 0x34, 0x9a, 0x94, 0x1d, 0xed, 0x41, 0xd3, 0xf3, 0x6d, 0x27, 0xf1, 0x6e, 0xb9, 0x4c, 0x97, - 0x9c, 0xa6, 0xd7, 0xb6, 0x27, 0x27, 0x02, 0x55, 0x8b, 0xbe, 0x51, 0xff, 0xca, 0x9b, 0x72, 0x2a, - 0x5e, 0xd9, 0xce, 0x32, 0x9a, 0x5c, 0x11, 0x57, 0x08, 0xf9, 0x7c, 0x14, 0x14, 0xe2, 0x47, 0x8f, - 0x31, 0xf1, 0x5e, 0x1d, 0x06, 0xfe, 0x95, 0x37, 0xc9, 0xf0, 0xbb, 0x83, 0xc7, 0x0b, 0x64, 0x6f, - 0x79, 0xaf, 0x15, 0x7b, 0xd6, 0x17, 0xed, 0xb9, 0x5a, 0x04, 0x57, 0x19, 0xbc, 0xd4, 0x4a, 0x83, - 0x97, 0xbd, 0x5f, 0x43, 0x43, 0x8c, 0x2c, 0xd8, 0x3a, 0xb4, 0x4e, 0xfc, 0x5b, 0x7b, 0xea, 0xb9, - 0x2f, 0x42, 0xa3, 0xc2, 0x9a, 0x50, 0x1b, 0x27, 0x41, 0x68, 0x68, 0xac, 0x05, 0xf5, 0x33, 0x4c, - 0x22, 0x43, 0x67, 0x00, 0x0d, 0xac, 0xb0, 0x19, 0x37, 0xaa, 0xc8, 0xa6, 0x69, 0x90, 0x51, 0x43, - 0xb6, 0x98, 0x53, 0x18, 0x75, 0xb6, 0x01, 0xf0, 0x55, 0x9a, 0x04, 0x52, 0xad, 0xb1, 0xb7, 0x07, - 0x75, 0x9a, 0x02, 0x90, 0xc1, 0x5f, 0x9c, 0x9c, 0x19, 0x15, 0xd6, 0x86, 0x35, 0xeb, 0xf8, 0x6c, - 0xf4, 0xd5, 0xf0, 0xd8, 0xd0, 0x70, 0xed, 0xc9, 0xf3, 0x9f, 0x1f, 0x0f, 0x2f, 0x0c, 0x7d, 0xef, - 0x97, 0x64, 0x72, 0x82, 0x3b, 0xe8, 0x48, 0x5f, 0x88, 0x36, 0x2a, 0x6c, 0x0d, 0xaa, 0xcf, 0xf9, - 0x9d, 0xa1, 0xd1, 0xe2, 0xd4, 0xc7, 0x47, 0x9a, 0xf0, 0x87, 0x5c, 0x73, 0x8d, 0x2a, 0x0a, 0xd0, - 0xe1, 0x90, 0xbb, 0x46, 0x8d, 0x75, 0xa0, 0xf9, 0xb5, 0x7c, 0x75, 0x19, 0xf5, 0xbd, 0x17, 0xd0, - 0xcc, 0x3a, 0x24, 0x7b, 0x04, 0x6d, 0x69, 0x1a, 0x59, 0x46, 0x05, 0xf7, 0x41, 0x7d, 0xd0, 0xd0, - 0xd0, 0x45, 0xec, 0x75, 0x86, 0x8e, 0x5f, 0xd8, 0xd0, 0x8c, 0x2a, 0xb9, 0x7d, 0xef, 0x3b, 0x46, - 0x0d, 0x15, 0x29, 0x67, 0x0c, 0x77, 0xef, 0x14, 0xd6, 0x64, 0x52, 0x32, 0x06, 0x1b, 0xd2, 0x9e, - 0xe4, 0x18, 0x15, 0x84, 0x12, 0x5d, 0x11, 0xda, 0x1a, 0x42, 0x42, 0x5e, 0x0a, 0x5a, 0x47, 0x17, - 0x04, 0x3c, 0x82, 0x51, 0x3d, 0xf8, 0x77, 0x03, 0x1a, 0x22, 0xf2, 0x6c, 0x08, 0x1d, 0x75, 0xc6, - 0xc6, 0x3e, 0x94, 0xed, 0xff, 0xe1, 0xd4, 0xad, 0xd7, 0xa5, 0x06, 0xbe, 0x60, 0x00, 0x62, 0x56, - 0xd8, 0x09, 0x6c, 0x94, 0xe7, 0x55, 0xec, 0x31, 0x6a, 0x2f, 0x1c, 0x86, 0xf5, 0x7a, 0x8b, 0x44, - 0xb9, 0xa9, 0x63, 0x58, 0x2f, 0x8d, 0xa0, 0x18, 0xfd, 0x77, 0xd1, 0x54, 0x6a, 0xa5, 0x47, 0x3f, - 0x83, 0xb6, 0x32, 0x39, 0x61, 0x3b, 0xa8, 0x3a, 0x3f, 0xae, 0xea, 0x7d, 0x38, 0xc7, 0xcf, 0x2d, - 0x7c, 0x09, 0x50, 0x8c, 0x32, 0xd8, 0x07, 0xb9, 0xa2, 0x3a, 0xc5, 0xea, 0xed, 0x3c, 0x64, 0xe7, - 0xcb, 0xbf, 0x06, 0x90, 0xa3, 0xac, 0xf3, 0x51, 0xcc, 0x3e, 0x42, 0xbd, 0x65, 0xa3, 0xad, 0x95, - 0x1b, 0x39, 0x85, 0xcd, 0xb9, 0x26, 0x28, 0xcc, 0x2d, 0xeb, 0x8d, 0x2b, 0xcd, 0x0d, 0xa1, 0xa3, - 0xf6, 0x40, 0x11, 0xee, 0x05, 0x9d, 0x54, 0x18, 0x59, 0xd4, 0x2e, 0xcd, 0x0a, 0xfb, 0x29, 0x40, - 0xd1, 0xd1, 0x04, 0x34, 0x73, 0x1d, 0x6e, 0xa5, 0x17, 0x4f, 0x61, 0x53, 0x99, 0xd6, 0x8a, 0xee, - 0x23, 0x62, 0x34, 0x3f, 0xc4, 0x5d, 0x69, 0xc8, 0x92, 0xa3, 0x45, 0xb5, 0x8d, 0x09, 0x74, 0x96, - 0x75, 0xbe, 0xde, 0xc7, 0x4b, 0xa4, 0x2a, 0x44, 0xea, 0x68, 0x58, 0x40, 0xb4, 0x60, 0x58, 0xbc, - 0xca, 0xb1, 0xc3, 0xee, 0x3f, 0x5f, 0xf7, 0xb5, 0x6f, 0x5e, 0xf7, 0xb5, 0xff, 0xbc, 0xee, 0x6b, - 0xbf, 0x7b, 0xd3, 0xaf, 0x7c, 0xf3, 0xa6, 0x5f, 0xf9, 0xd7, 0x9b, 0x7e, 0xe5, 0xb2, 0x41, 0xf3, - 0xed, 0xef, 0xff, 0x2f, 0x00, 0x00, 0xff, 0xff, 0x3e, 0x95, 0x7d, 0x75, 0xf1, 0x16, 0x00, 0x00, + 0x15, 0x6f, 0xbb, 0x3f, 0xd2, 0xfd, 0xba, 0x3b, 0xe3, 0xd4, 0x64, 0xb3, 0x3d, 0xcd, 0x6e, 0xd3, + 0xf2, 0xac, 0x76, 0xb3, 0x39, 0x44, 0x6c, 0x00, 0x21, 0x21, 0x2d, 0xb0, 0xe9, 0x64, 0x67, 0x02, + 0x9d, 0x99, 0xc4, 0x9d, 0x11, 0x47, 0xe4, 0xd8, 0x95, 0x8e, 0x95, 0x6e, 0xdb, 0xe3, 0x8f, 0x44, + 0xf9, 0x27, 0x80, 0x0b, 0x07, 0x04, 0x37, 0x84, 0xb8, 0x20, 0xfe, 0x0d, 0x38, 0xee, 0x91, 0x1b, + 0x68, 0xe6, 0xdf, 0xe0, 0x80, 0xde, 0xab, 0xb2, 0x5d, 0x4e, 0x7f, 0xcc, 0x8e, 0x04, 0x37, 0xbf, + 0x8f, 0x7a, 0x7e, 0xf5, 0x7b, 0x1f, 0x55, 0xf5, 0x60, 0xd3, 0x9d, 0xdf, 0x05, 0xd1, 0x0d, 0x8f, + 0xf6, 0xc3, 0x28, 0x48, 0x02, 0xa6, 0x87, 0x97, 0xe6, 0xe7, 0xf0, 0x78, 0x92, 0xd8, 0x51, 0x32, + 0x49, 0x2f, 0x2f, 0xec, 0xf8, 0xc6, 0xe2, 0xaf, 0x53, 0x1e, 0x27, 0x8c, 0x41, 0x2d, 0xb1, 0xe3, + 0x9b, 0x9e, 0x36, 0xd4, 0x76, 0x5b, 0x16, 0x7d, 0x9b, 0xfb, 0xc0, 0x5e, 0x85, 0xae, 0x9d, 0x70, + 0x8b, 0xcf, 0xec, 0xfb, 0x4c, 0xb3, 0x07, 0x1b, 0x4e, 0xe0, 0x27, 0xdc, 0x4f, 0xa4, 0x72, 0x46, + 0x9a, 0x13, 0x78, 0x7c, 0xea, 0x4d, 0xa3, 0x87, 0x0b, 0x06, 0x00, 0x87, 0x9e, 0x3f, 0x0b, 0xa6, + 0x2f, 0xec, 0x39, 0x97, 0x6b, 0x14, 0x0e, 0xfb, 0x08, 0x5a, 0x82, 0x3a, 0x0b, 0xe2, 0x9e, 0x3e, + 0xd4, 0x76, 0xbb, 0x56, 0xc1, 0x30, 0x9f, 0xc1, 0x07, 0x2f, 0x43, 0x8e, 0x46, 0x1f, 0x78, 0xdc, + 0x07, 0x3d, 0x08, 0xc9, 0xdc, 0xe6, 0x01, 0xec, 0x87, 0x97, 0xfb, 0x28, 0x7c, 0x19, 0x5a, 0x7a, + 0x10, 0xe2, 0x6e, 0x7c, 0xfc, 0x99, 0x2e, 0x76, 0x83, 0xdf, 0xe6, 0x2d, 0xec, 0x3c, 0x34, 0x14, + 0x87, 0x81, 0x1f, 0xf3, 0xb5, 0x96, 0x76, 0xa0, 0x11, 0xf1, 0x38, 0x9d, 0x25, 0x64, 0xab, 0x69, + 0x49, 0x0a, 0xf9, 0x71, 0x90, 0x46, 0x0e, 0xef, 0x55, 0xe9, 0x1f, 0x92, 0x62, 0x06, 0x54, 0xe7, + 0xf1, 0xb4, 0x57, 0x23, 0x26, 0x7e, 0x9a, 0x7b, 0xb0, 0x2d, 0x50, 0xfc, 0x16, 0x88, 0xef, 0x02, + 0x3b, 0x4f, 0x79, 0x74, 0x3f, 0x49, 0xec, 0x24, 0x8d, 0x15, 0x4d, 0xbf, 0x80, 0x4e, 0xec, 0xe6, + 0x33, 0xd8, 0x22, 0xcd, 0xe3, 0x28, 0x0a, 0xa2, 0x75, 0x8a, 0x7f, 0xd0, 0xa0, 0xf7, 0xdc, 0xf6, + 0xdd, 0x59, 0xf6, 0xff, 0xc9, 0xf9, 0x78, 0x9d, 0x65, 0xf6, 0x84, 0xd0, 0xd0, 0x09, 0x8d, 0x16, + 0xa2, 0x31, 0x39, 0x1f, 0x17, 0xb0, 0xda, 0xd1, 0x34, 0xee, 0x55, 0x87, 0x55, 0x54, 0xc7, 0x6f, + 0x8c, 0xde, 0x65, 0x1e, 0x3d, 0xb1, 0xed, 0x82, 0x81, 0xb1, 0x8f, 0x5f, 0xcf, 0xce, 0xec, 0x24, + 0xe1, 0x91, 0xdf, 0xab, 0x8b, 0xd8, 0x17, 0x1c, 0x33, 0x84, 0xed, 0x51, 0x30, 0x9f, 0x07, 0xfe, + 0x2f, 0x29, 0x4f, 0xf3, 0x90, 0x14, 0xb0, 0x6b, 0x25, 0xd8, 0x25, 0xbc, 0x7a, 0x0e, 0xef, 0xca, + 0x40, 0xec, 0x40, 0x43, 0xe4, 0xbe, 0x74, 0x4a, 0x52, 0xe6, 0xdf, 0x34, 0x78, 0x5c, 0xc2, 0xf8, + 0xbd, 0xff, 0xf8, 0x03, 0xe8, 0x88, 0x7f, 0x08, 0x0b, 0xf4, 0xdf, 0xf6, 0x81, 0x41, 0x50, 0x29, + 0x7c, 0xab, 0xa4, 0xc5, 0x7e, 0x04, 0xdd, 0x58, 0x06, 0x40, 0x2c, 0xab, 0x0d, 0xab, 0xbb, 0xed, + 0x83, 0x2d, 0x5a, 0xa6, 0x0a, 0xac, 0xb2, 0x9e, 0xf9, 0x17, 0x4d, 0x26, 0x85, 0x0c, 0xf5, 0x7b, + 0xfb, 0xfb, 0x05, 0xb4, 0x85, 0x5f, 0x64, 0x40, 0xba, 0xfb, 0xa8, 0x70, 0x57, 0xd8, 0x55, 0x75, + 0x68, 0x8b, 0xc2, 0x09, 0xb1, 0x46, 0xf8, 0x6a, 0x28, 0xbe, 0x8a, 0x45, 0x25, 0x2d, 0xf3, 0xcf, + 0x1a, 0xb4, 0x47, 0xd7, 0xdc, 0x91, 0x9e, 0xa3, 0x8b, 0xa1, 0x1d, 0xc7, 0xdc, 0xcd, 0x5c, 0x14, + 0x14, 0xdb, 0x86, 0x7a, 0x12, 0x24, 0xf6, 0x8c, 0x9c, 0xac, 0x5b, 0x82, 0xa0, 0x54, 0x49, 0x1d, + 0x87, 0xc7, 0xf1, 0x55, 0x3a, 0x23, 0x2f, 0xeb, 0x96, 0xc2, 0x41, 0x6b, 0x57, 0xb6, 0x37, 0xe3, + 0x2e, 0x05, 0xb4, 0x6e, 0x49, 0x0a, 0xfb, 0xd1, 0x9d, 0x1d, 0xf9, 0x9e, 0x3f, 0xa5, 0xfc, 0xaa, + 0x5b, 0x19, 0x89, 0x2b, 0x5c, 0x9e, 0xd8, 0xde, 0xac, 0xd7, 0x18, 0x6a, 0xbb, 0x1d, 0x4b, 0x52, + 0x66, 0x07, 0xe0, 0x28, 0x9d, 0x87, 0x12, 0xdf, 0x5f, 0x6b, 0x00, 0xe3, 0xc0, 0x76, 0xa5, 0xd3, + 0x9f, 0x40, 0xf7, 0xca, 0xf3, 0xbd, 0xf8, 0x9a, 0xbb, 0x87, 0xf7, 0x09, 0x8f, 0xc9, 0xf7, 0xaa, + 0x55, 0x66, 0xa2, 0xb3, 0xe4, 0xb5, 0x50, 0xd1, 0x49, 0x45, 0xe1, 0xb0, 0x3e, 0x34, 0xc3, 0x28, + 0x98, 0x46, 0x3c, 0x8e, 0x65, 0x5e, 0xe6, 0x34, 0xae, 0x9d, 0xf3, 0xc4, 0x16, 0x2d, 0x4e, 0x66, + 0xa7, 0xc2, 0x31, 0x7f, 0xa7, 0x41, 0x77, 0x72, 0x6d, 0x47, 0xae, 0xe7, 0x4f, 0x9f, 0x45, 0x41, + 0x4a, 0x4d, 0x28, 0xb1, 0xa3, 0x29, 0xcf, 0x3a, 0xae, 0xa4, 0xb0, 0x1e, 0x8f, 0x8e, 0xc6, 0xf8, + 0x7f, 0xaa, 0x47, 0xfc, 0x16, 0xfe, 0x47, 0x71, 0x32, 0x0e, 0x1c, 0x3b, 0xf1, 0x02, 0x5f, 0xfe, + 0xbe, 0xcc, 0xa4, 0xaa, 0xb9, 0xf7, 0x1d, 0x02, 0xb3, 0x4a, 0x55, 0x43, 0x14, 0xfa, 0x9d, 0xfa, + 0x52, 0x52, 0x27, 0x49, 0x4e, 0x9b, 0x7f, 0xaa, 0x02, 0x4c, 0xee, 0x7d, 0x47, 0x02, 0x35, 0x84, + 0x36, 0x6d, 0xf8, 0xf8, 0x96, 0xfb, 0x49, 0x06, 0x93, 0xca, 0x42, 0x63, 0x44, 0x5e, 0x84, 0x19, + 0x44, 0x39, 0x8d, 0x6d, 0x23, 0xe2, 0x0e, 0xf7, 0x13, 0x14, 0x56, 0x49, 0x58, 0x30, 0x98, 0x09, + 0x9d, 0xb9, 0x1d, 0x27, 0x3c, 0x2a, 0x81, 0x54, 0xe2, 0xb1, 0x3d, 0x30, 0x54, 0xfa, 0x59, 0xe2, + 0xb9, 0xb2, 0xc1, 0x2c, 0xf0, 0xd1, 0x1e, 0x6d, 0x22, 0xb3, 0xd7, 0x10, 0xf6, 0x54, 0x1e, 0xda, + 0x53, 0x69, 0xb2, 0xb7, 0x21, 0xec, 0x3d, 0xe4, 0xa3, 0xbd, 0xcb, 0x59, 0xe0, 0xdc, 0x78, 0xfe, + 0x94, 0x02, 0xd0, 0x24, 0xa8, 0x4a, 0x3c, 0xf6, 0x25, 0x18, 0xa9, 0x1f, 0xf1, 0x38, 0x98, 0xdd, + 0x72, 0x97, 0xe2, 0x18, 0xf7, 0x5a, 0x4a, 0xcd, 0xab, 0x11, 0xb6, 0x16, 0x54, 0x95, 0x08, 0x81, + 0x28, 0x1e, 0x19, 0xa1, 0x01, 0x80, 0x68, 0xaf, 0x17, 0xf7, 0x21, 0xef, 0xb5, 0x45, 0xf6, 0x14, + 0x1c, 0xf3, 0x8f, 0x1a, 0x74, 0xd4, 0x36, 0xa4, 0x34, 0x48, 0x6d, 0x45, 0x83, 0xd4, 0xd5, 0x06, + 0xc9, 0x3e, 0xcf, 0x1b, 0x8b, 0xe8, 0x14, 0xe4, 0xed, 0x59, 0x14, 0x60, 0x1d, 0x5a, 0x24, 0xc8, + 0x7b, 0xcd, 0x17, 0xd0, 0x8e, 0xf0, 0xa4, 0xcf, 0x3b, 0x5a, 0xde, 0x59, 0xac, 0x82, 0x6d, 0xa9, + 0x3a, 0xe6, 0xdf, 0x75, 0x68, 0x2b, 0xc2, 0x85, 0x48, 0x6b, 0xdf, 0x32, 0xd2, 0xfa, 0x8a, 0x48, + 0x0f, 0x33, 0x97, 0xd2, 0xcb, 0x23, 0x2f, 0x92, 0xc9, 0xaf, 0xb2, 0x72, 0x8d, 0x52, 0x6a, 0xa9, + 0x2c, 0xb6, 0x0b, 0x8f, 0x14, 0x52, 0x49, 0xac, 0x87, 0x6c, 0xb6, 0x0f, 0x8c, 0x58, 0x23, 0x3b, + 0x71, 0xae, 0x5f, 0x85, 0xa7, 0xe4, 0x0d, 0x65, 0x57, 0xd3, 0x5a, 0x22, 0x61, 0xdf, 0x85, 0x7a, + 0x9c, 0xd8, 0x53, 0x4e, 0x89, 0x95, 0x1d, 0xaf, 0xc8, 0xb0, 0x04, 0x5f, 0x01, 0xbf, 0xf9, 0x0e, + 0xf0, 0xcd, 0xff, 0xe8, 0xd0, 0x2d, 0x1d, 0x1c, 0x4b, 0x4f, 0xf3, 0xfc, 0x8f, 0xfa, 0x8a, 0x3f, + 0x0e, 0xa1, 0x96, 0xfa, 0x9e, 0x08, 0xf6, 0xe6, 0x41, 0x07, 0xe5, 0xaf, 0x7c, 0x2f, 0xc1, 0x5c, + 0xb2, 0x48, 0xa2, 0xf8, 0x54, 0x7b, 0x57, 0x42, 0x7c, 0x0f, 0x1e, 0x17, 0x89, 0x7c, 0x74, 0x34, + 0x1e, 0x07, 0xce, 0xcd, 0xc9, 0x91, 0x44, 0x6f, 0x99, 0x88, 0x31, 0x71, 0x5c, 0x51, 0x41, 0x3e, + 0xaf, 0x88, 0x03, 0xeb, 0x33, 0xa8, 0x3b, 0x78, 0x8c, 0x10, 0x4a, 0x32, 0xa1, 0x94, 0x73, 0xe5, + 0x79, 0xc5, 0x12, 0x72, 0xf6, 0x09, 0xd4, 0xdc, 0x74, 0x1e, 0x4a, 0xac, 0x36, 0x51, 0xaf, 0x68, + 0xec, 0xcf, 0x2b, 0x16, 0x49, 0x51, 0x6b, 0x16, 0xd8, 0x6e, 0xaf, 0x55, 0x68, 0x15, 0xfd, 0x1e, + 0xb5, 0x50, 0x8a, 0x5a, 0x58, 0x61, 0x54, 0x6d, 0x52, 0xab, 0x68, 0x76, 0xa8, 0x85, 0xd2, 0xc3, + 0x26, 0x34, 0x62, 0x91, 0xc8, 0x3f, 0x81, 0xad, 0x12, 0xfa, 0x63, 0x2f, 0x26, 0xa8, 0x84, 0xb8, + 0xa7, 0xad, 0x3a, 0xdd, 0xb3, 0xf5, 0x03, 0x00, 0xda, 0x93, 0x38, 0x70, 0xe5, 0xa9, 0xad, 0x15, + 0xd7, 0xc6, 0x8f, 0xa1, 0x85, 0x7b, 0x59, 0x23, 0xc6, 0x4d, 0xac, 0x12, 0x87, 0xd0, 0x21, 0xef, + 0xcf, 0xc7, 0x2b, 0x34, 0xd8, 0x01, 0x6c, 0x8b, 0x03, 0x34, 0xbf, 0x6a, 0x7b, 0x74, 0x5c, 0x88, + 0xc2, 0x5a, 0x2a, 0xc3, 0x86, 0xce, 0xd1, 0xdc, 0xe4, 0x7c, 0x9c, 0x9d, 0x6a, 0x19, 0x6d, 0xfe, + 0x10, 0x5a, 0xf8, 0x47, 0xf1, 0xbb, 0x5d, 0x68, 0x90, 0x20, 0xc3, 0xc1, 0xc8, 0xe1, 0x94, 0x0e, + 0x59, 0x52, 0x6e, 0xfe, 0x46, 0x2b, 0xdd, 0x4e, 0xde, 0xbb, 0x5b, 0x0d, 0x17, 0x2f, 0x37, 0xad, + 0xf2, 0x5d, 0x66, 0x1f, 0x80, 0x1a, 0x4e, 0x76, 0x93, 0xc9, 0xc3, 0x5b, 0x70, 0x2d, 0x45, 0x03, + 0x03, 0x53, 0x50, 0x4b, 0xa0, 0xfd, 0xbd, 0x0e, 0x1d, 0xf5, 0x12, 0xf4, 0xff, 0x2a, 0x3b, 0xa6, + 0xbc, 0x24, 0xb2, 0xca, 0xf8, 0x34, 0xab, 0x8c, 0x7a, 0xb1, 0x8d, 0x22, 0x8b, 0x8a, 0xc2, 0x78, + 0x2a, 0x0b, 0xa3, 0x41, 0x6a, 0xdd, 0xac, 0x30, 0x32, 0x2d, 0x51, 0x17, 0x4f, 0x65, 0x5d, 0x6c, + 0x14, 0x4a, 0x79, 0x4a, 0xe5, 0x65, 0xf1, 0x54, 0x96, 0x45, 0xb3, 0x50, 0xca, 0xc3, 0x9c, 0x57, + 0xc5, 0x06, 0xd4, 0x29, 0x9c, 0xe6, 0x8f, 0xc1, 0x50, 0xa1, 0xa1, 0x9a, 0xf8, 0x54, 0x0a, 0x4b, + 0xa9, 0xa0, 0x5e, 0x22, 0xe5, 0xda, 0xd7, 0xd0, 0x2d, 0x35, 0x15, 0x3c, 0xe9, 0xbc, 0x78, 0x64, + 0xfb, 0x0e, 0x9f, 0xe5, 0x57, 0x48, 0x85, 0xa3, 0x24, 0x99, 0x5e, 0x58, 0x96, 0x26, 0x4a, 0x49, + 0xa6, 0x5c, 0x04, 0xab, 0xa5, 0x8b, 0xe0, 0x5f, 0x35, 0x68, 0x5c, 0x88, 0x20, 0xf6, 0x60, 0xe3, + 0x38, 0x8a, 0x46, 0x81, 0x2b, 0xe2, 0x58, 0xb7, 0x32, 0x12, 0x93, 0x1e, 0x3f, 0x67, 0x76, 0x1c, + 0xcb, 0x0b, 0x6b, 0x4e, 0x4b, 0xd9, 0xc4, 0x09, 0x42, 0x2e, 0x6f, 0xac, 0x39, 0x2d, 0x65, 0x63, + 0x7e, 0xcb, 0x67, 0xf2, 0xc6, 0x9a, 0xd3, 0xf8, 0xb7, 0x53, 0x1e, 0xc7, 0x98, 0x20, 0xa2, 0x37, + 0x66, 0x24, 0xae, 0xb2, 0xec, 0xbb, 0x91, 0x9d, 0xc6, 0x5c, 0xde, 0x52, 0x72, 0xda, 0x3c, 0x84, + 0x8e, 0xba, 0xbd, 0x25, 0x45, 0x3d, 0xcc, 0xb0, 0xd6, 0x29, 0x5c, 0xe2, 0x31, 0x5b, 0x42, 0xb9, + 0x0f, 0xbd, 0xc9, 0x9d, 0x97, 0x38, 0xd7, 0x94, 0xe3, 0xe2, 0x58, 0x92, 0xaf, 0x41, 0xf3, 0x00, + 0x1e, 0xcb, 0x17, 0x72, 0xe9, 0xfd, 0xfe, 0x1d, 0xe5, 0x79, 0xdc, 0xce, 0x0b, 0x47, 0x3c, 0x09, + 0xcd, 0x14, 0xb6, 0xcb, 0x6b, 0xe4, 0xf3, 0x64, 0xdd, 0xa2, 0xff, 0xc1, 0xa3, 0xfa, 0x0e, 0xb6, + 0xce, 0xd2, 0x68, 0x5a, 0x76, 0xb4, 0x0f, 0x4d, 0xcf, 0xb7, 0x9d, 0xc4, 0xbb, 0xe5, 0x32, 0x5d, + 0x72, 0x9a, 0x5e, 0xdb, 0x9e, 0x9c, 0x08, 0x54, 0x2d, 0xfa, 0x46, 0xfd, 0x2b, 0x6f, 0xc6, 0xa9, + 0x78, 0x65, 0x3b, 0xcb, 0x68, 0x72, 0x45, 0x5c, 0x21, 0xe4, 0xf3, 0x51, 0x50, 0x88, 0x1f, 0x3d, + 0xc6, 0xc4, 0x7b, 0x75, 0x14, 0xf8, 0x57, 0xde, 0x34, 0xc3, 0xef, 0x0e, 0x9e, 0x2c, 0x91, 0xbd, + 0xe3, 0xbd, 0x56, 0xec, 0x59, 0x5f, 0xb6, 0xe7, 0x6a, 0x11, 0x5c, 0x65, 0xf0, 0x52, 0x2b, 0x0d, + 0x5e, 0xf6, 0x7e, 0x05, 0x0d, 0x31, 0xb2, 0x60, 0x5d, 0x68, 0x9d, 0xf8, 0xb7, 0xf6, 0xcc, 0x73, + 0x5f, 0x86, 0x46, 0x85, 0x35, 0xa1, 0x36, 0x49, 0x82, 0xd0, 0xd0, 0x58, 0x0b, 0xea, 0x67, 0x98, + 0x44, 0x86, 0xce, 0x00, 0x1a, 0x58, 0x61, 0x73, 0x6e, 0x54, 0x91, 0x4d, 0xd3, 0x20, 0xa3, 0x86, + 0x6c, 0x31, 0xa7, 0x30, 0xea, 0x6c, 0x13, 0xe0, 0xab, 0x34, 0x09, 0xa4, 0x5a, 0x63, 0x6f, 0x0f, + 0xea, 0x34, 0x05, 0x20, 0x83, 0xbf, 0x38, 0x39, 0x33, 0x2a, 0xac, 0x0d, 0x1b, 0xd6, 0xf1, 0xd9, + 0xf8, 0xab, 0xd1, 0xb1, 0xa1, 0xe1, 0xda, 0x93, 0x17, 0x3f, 0x3f, 0x1e, 0x5d, 0x18, 0xfa, 0xde, + 0x6b, 0x32, 0x39, 0xc5, 0x1d, 0x74, 0xa4, 0x2f, 0x44, 0x1b, 0x15, 0xb6, 0x01, 0xd5, 0x17, 0xfc, + 0xce, 0xd0, 0x68, 0x71, 0xea, 0xe3, 0x23, 0x4d, 0xf8, 0x43, 0xae, 0xb9, 0x46, 0x15, 0x05, 0xe8, + 0x70, 0xc8, 0x5d, 0xa3, 0xc6, 0x3a, 0xd0, 0xfc, 0x5a, 0xbe, 0xba, 0x8c, 0x3a, 0x8a, 0x50, 0x0d, + 0xd7, 0x34, 0x50, 0x44, 0xce, 0x21, 0xb5, 0xb1, 0xf7, 0x12, 0x9a, 0x59, 0xf3, 0x64, 0x8f, 0xa0, + 0x2d, 0xff, 0x8a, 0x2c, 0xa3, 0x82, 0x5b, 0xa4, 0x16, 0x69, 0x68, 0xe8, 0x3d, 0xb6, 0x41, 0x43, + 0xc7, 0x2f, 0xec, 0x75, 0x46, 0x95, 0x76, 0x74, 0xef, 0x3b, 0x46, 0x0d, 0x15, 0x29, 0x9d, 0x0c, + 0x77, 0xef, 0x14, 0x36, 0x64, 0xbe, 0x32, 0x06, 0x9b, 0xd2, 0x9e, 0xe4, 0x18, 0x15, 0x44, 0x19, + 0xbd, 0x14, 0xda, 0x1a, 0xa2, 0x45, 0x1b, 0x10, 0xb4, 0x8e, 0x2e, 0x08, 0xe4, 0x04, 0xa3, 0x7a, + 0xf0, 0xaf, 0x06, 0x34, 0x44, 0x52, 0xb0, 0x11, 0x74, 0xd4, 0xf1, 0x1b, 0xfb, 0x50, 0x9e, 0x0c, + 0x0f, 0x07, 0x72, 0xfd, 0x1e, 0xf5, 0xf6, 0x25, 0xb3, 0x11, 0xb3, 0xc2, 0x4e, 0x60, 0xb3, 0x3c, + 0xca, 0x62, 0x4f, 0x50, 0x7b, 0xe9, 0x9c, 0xac, 0xdf, 0x5f, 0x26, 0xca, 0x4d, 0x1d, 0x43, 0xb7, + 0x34, 0x9d, 0x62, 0xf4, 0xdf, 0x65, 0x03, 0xab, 0xb5, 0x1e, 0xfd, 0x0c, 0xda, 0xca, 0x50, 0x85, + 0xed, 0xa0, 0xea, 0xe2, 0x24, 0xab, 0xff, 0xe1, 0x02, 0x3f, 0xb7, 0xf0, 0x25, 0x40, 0x31, 0xe5, + 0x60, 0x1f, 0xe4, 0x8a, 0xea, 0x80, 0xab, 0xbf, 0xf3, 0x90, 0x9d, 0x2f, 0xff, 0x1a, 0x40, 0x4e, + 0xb9, 0xce, 0xc7, 0x31, 0xfb, 0x08, 0xf5, 0x56, 0x4d, 0xbd, 0xd6, 0x6e, 0xe4, 0x14, 0xb6, 0x16, + 0xfa, 0xa3, 0x30, 0xb7, 0xaa, 0x6d, 0xae, 0x35, 0x37, 0x82, 0x8e, 0xda, 0x1e, 0x45, 0xb8, 0x97, + 0x34, 0x59, 0x61, 0x64, 0x59, 0x27, 0x35, 0x2b, 0xec, 0xa7, 0x00, 0x45, 0xb3, 0x13, 0xd0, 0x2c, + 0x34, 0xbf, 0xb5, 0x5e, 0x3c, 0x83, 0x2d, 0x65, 0x90, 0x2b, 0x1a, 0x93, 0x88, 0xd1, 0xe2, 0x7c, + 0x77, 0xad, 0x21, 0x4b, 0x4e, 0x1d, 0xd5, 0x0e, 0x27, 0xd0, 0x59, 0xd5, 0x14, 0xfb, 0x1f, 0xaf, + 0x90, 0xaa, 0x10, 0xa9, 0x53, 0x63, 0x01, 0xd1, 0x92, 0x39, 0xf2, 0x3a, 0xc7, 0x0e, 0x7b, 0xff, + 0x78, 0x33, 0xd0, 0xbe, 0x79, 0x33, 0xd0, 0xfe, 0xfd, 0x66, 0xa0, 0xfd, 0xf6, 0xed, 0xa0, 0xf2, + 0xcd, 0xdb, 0x41, 0xe5, 0x9f, 0x6f, 0x07, 0x95, 0xcb, 0x06, 0x8d, 0xbe, 0xbf, 0xff, 0xdf, 0x00, + 0x00, 0x00, 0xff, 0xff, 0xa8, 0xf6, 0x33, 0x41, 0x0c, 0x17, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. diff --git a/dm/proto/dmworker.proto b/dm/proto/dmworker.proto index d05ce8943f..af7c2dc9da 100644 --- a/dm/proto/dmworker.proto +++ b/dm/proto/dmworker.proto @@ -145,6 +145,9 @@ enum Stage { Paused = 3; Stopped = 4; Finished = 5; + + Pausing = 6; + Resuming = 7; } // CheckStatus represents status for check unit diff --git a/dm/unit/unit.go b/dm/unit/unit.go index 3669bdf0d8..6e1e393a5c 100644 --- a/dm/unit/unit.go +++ b/dm/unit/unit.go @@ -15,6 +15,7 @@ package unit import ( "context" + "strings" "time" "github.com/pingcap/dm/dm/config" @@ -77,3 +78,11 @@ func NewProcessError(err error) *pb.ProcessError { } return result } + +// IsCtxCanceledProcessErr returns true if the err's context canceled +func IsCtxCanceledProcessErr(err *pb.ProcessError) bool { + if strings.Contains(err.Msg, "context canceled") { + return true + } + return false +} diff --git a/dm/unit/unit_test.go b/dm/unit/unit_test.go new file mode 100644 index 0000000000..021b08e693 --- /dev/null +++ b/dm/unit/unit_test.go @@ -0,0 +1,33 @@ +// Copyright 2020 PingCAP, Inc. +// +// Licensed under the Apache License, Version 2.0 (the "License"); +// you may not use this file except in compliance with the License. +// You may obtain a copy of the License at +// +// http://www.apache.org/licenses/LICENSE-2.0 +// +// Unless required by applicable law or agreed to in writing, software +// distributed under the License is distributed on an "AS IS" BASIS, +// See the License for the specific language governing permissions and +// limitations under the License. + +package unit + +import ( + "context" + + "github.com/pingcap/check" + "github.com/pingcap/errors" +) + +var _ = check.Suite(&testUnitSuite{}) + +type testUnitSuite struct{} + +func (t *testUnitSuite) TestIsCtxCanceledProcessErr(c *check.C) { + err := NewProcessError(context.Canceled) + c.Assert(IsCtxCanceledProcessErr(err), check.IsTrue) + + err = NewProcessError(errors.New("123")) + c.Assert(IsCtxCanceledProcessErr(err), check.IsFalse) +} diff --git a/dm/worker/subtask.go b/dm/worker/subtask.go index de5341efec..1c099f89c0 100644 --- a/dm/worker/subtask.go +++ b/dm/worker/subtask.go @@ -236,18 +236,25 @@ func (st *SubTask) callCurrCancel() { func (st *SubTask) fetchResult(pr chan pb.ProcessResult) { defer st.wg.Done() - st.RLock() - ctx := st.currCtx - st.RUnlock() - select { - case <-ctx.Done(): + case <-st.ctx.Done(): + // should not use st.currCtx, because will do st.currCancel when Pause task, + // and this function will return, and the unit's Process maybe still running. return case result := <-pr: + // filter the context canceled error + errs := make([]*pb.ProcessError, 0, 2) + for _, err := range result.Errors { + if !unit.IsCtxCanceledProcessErr(err) { + errs = append(errs, err) + } + } + result.Errors = errs + st.setResult(&result) // save result st.callCurrCancel() // dm-unit finished, canceled or error occurred, always cancel processing - if len(result.Errors) == 0 && st.Stage() == pb.Stage_Paused { + if len(result.Errors) == 0 && st.Stage() == pb.Stage_Pausing { return // paused by external request } @@ -371,6 +378,7 @@ func (st *SubTask) setStage(stage pb.Stage) { func (st *SubTask) stageCAS(oldStage, newStage pb.Stage) bool { st.Lock() defer st.Unlock() + if st.stage == oldStage { st.stage = newStage taskState.WithLabelValues(st.cfg.Name).Set(float64(st.stage)) @@ -428,8 +436,8 @@ func (st *SubTask) Close() { // Pause pauses the running sub task func (st *SubTask) Pause() error { - if !st.stageCAS(pb.Stage_Running, pb.Stage_Paused) { - return terror.ErrWorkerNotRunningStage.Generate() + if !st.stageCAS(pb.Stage_Running, pb.Stage_Pausing) { + return terror.ErrWorkerNotRunningStage.Generate(st.Stage().String()) } st.callCurrCancel() @@ -439,6 +447,7 @@ func (st *SubTask) Pause() error { cu.Pause() st.l.Info("paused", zap.Stringer("unit", cu.Type())) + st.setStage(pb.Stage_Paused) return nil } @@ -450,9 +459,10 @@ func (st *SubTask) Resume() error { return nil } - if !st.stageCAS(pb.Stage_Paused, pb.Stage_Running) { - return terror.ErrWorkerNotPausedStage.Generate() + if !st.stageCAS(pb.Stage_Paused, pb.Stage_Resuming) { + return terror.ErrWorkerNotPausedStage.Generate(st.Stage().String()) } + ctx, cancel := context.WithCancel(st.ctx) st.setCurrCtx(ctx, cancel) // NOTE: this may block if user resume a task @@ -462,6 +472,8 @@ func (st *SubTask) Resume() error { st.setStage(pb.Stage_Paused) return err } else if ctx.Err() != nil { + // ctx.Err() != nil means this context is canceled in other go routine, + // that go routine will change the stage, so don't need to set stage to paused here. return nil } @@ -473,6 +485,8 @@ func (st *SubTask) Resume() error { st.wg.Add(1) go st.fetchResult(pr) go cu.Resume(ctx, pr) + + st.setStage(pb.Stage_Running) return nil } diff --git a/loader/loader.go b/loader/loader.go index d8c87f5013..cbd549140c 100644 --- a/loader/loader.go +++ b/loader/loader.go @@ -505,13 +505,13 @@ func (l *Loader) Process(ctx context.Context, pr chan pb.ProcessResult) { } isCanceled := false - if len(errs) == 0 { - select { - case <-ctx.Done(): - isCanceled = true - default: - } - } else { + select { + case <-ctx.Done(): + isCanceled = true + default: + } + + if len(errs) != 0 { // pause because of error occurred l.Pause() } diff --git a/pkg/terror/error_list.go b/pkg/terror/error_list.go index e3152adc1b..abb5a9b5e1 100644 --- a/pkg/terror/error_list.go +++ b/pkg/terror/error_list.go @@ -981,8 +981,8 @@ var ( ErrWorkerNoStart = New(codeWorkerNoStart, ClassDMWorker, ScopeInternal, LevelHigh, "worker has not started") ErrWorkerAlreadyClosed = New(codeWorkerAlreadyClosed, ClassDMWorker, ScopeInternal, LevelHigh, "worker already closed") ErrWorkerAlreadyStart = New(codeWorkerAlreadyStarted, ClassDMWorker, ScopeInternal, LevelHigh, "worker already started") - ErrWorkerNotRunningStage = New(codeWorkerNotRunningStage, ClassDMWorker, ScopeInternal, LevelHigh, "current stage is not running not valid") - ErrWorkerNotPausedStage = New(codeWorkerNotPausedStage, ClassDMWorker, ScopeInternal, LevelHigh, "current stage is not paused not valid") + ErrWorkerNotRunningStage = New(codeWorkerNotRunningStage, ClassDMWorker, ScopeInternal, LevelHigh, "current stage is %s but not running, invalid") + ErrWorkerNotPausedStage = New(codeWorkerNotPausedStage, ClassDMWorker, ScopeInternal, LevelHigh, "current stage is %s but not paused, invalid") ErrWorkerUpdateTaskStage = New(codeWorkerUpdateTaskStage, ClassDMWorker, ScopeInternal, LevelHigh, "can only update task on Paused stage, but current stage is %s") ErrWorkerMigrateStopRelay = New(codeWorkerMigrateStopRelay, ClassDMWorker, ScopeInternal, LevelHigh, "relay unit has stopped, can not be migrated") ErrWorkerSubTaskNotFound = New(codeWorkerSubTaskNotFound, ClassDMWorker, ScopeInternal, LevelHigh, "sub task with name %s not found") diff --git a/syncer/syncer.go b/syncer/syncer.go index 8861006049..14e5c0549e 100644 --- a/syncer/syncer.go +++ b/syncer/syncer.go @@ -550,13 +550,13 @@ func (s *Syncer) Process(ctx context.Context, pr chan pb.ProcessResult) { } isCanceled := false - if len(errs) == 0 { - select { - case <-ctx.Done(): - isCanceled = true - default: - } - } else { + select { + case <-ctx.Done(): + isCanceled = true + default: + } + + if len(errs) != 0 { // pause because of error occurred s.Pause() } diff --git a/tests/sharding/run.sh b/tests/sharding/run.sh index 4312b547f7..0c3daed778 100755 --- a/tests/sharding/run.sh +++ b/tests/sharding/run.sh @@ -90,12 +90,22 @@ function run() { # `FIXME: the following case is not supported automatically now, try to support it later` # so we try to do this `pause-task` and `resume-task` in the case now. sleep 3 + # pause twice, just used to test pause by the way + run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \ + "pause-task test"\ + "\"result\": true" 3 run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \ "pause-task test"\ "\"result\": true" 3 # wait really paused - # FIXME: `if !st.stageCAS(pb.Stage_Running, pb.Stage_Paused)` in `subtask.go` is not enough to indicate the real stage. - sleep 2 + run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \ + "query-status test" \ + "Paused" 2 + + # resume twice, just used to test resume by the way + run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \ + "resume-task test"\ + "\"result\": true" 3 run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \ "resume-task test"\ "\"result\": true" 3 @@ -128,6 +138,14 @@ function run() { new_checksum=$(checksum) echo "checksum before drop/truncate: $old_checksum, checksum after drop/truncate: $new_checksum" [ "$old_checksum" == "$new_checksum" ] + + # stop twice, just used to test stop by the way + run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \ + "stop-task test"\ + "\"result\": true" 3 + run_dm_ctl_with_retry $WORK_DIR "127.0.0.1:$MASTER_PORT" \ + "stop-task test"\ + "task test has no source or not exist" 1 } cleanup_data db_target