stream_migrater: integrate with migrater

Signed-off-by: Sugu Sougoumarane <ssougou@gmail.com>
This commit is contained in:
Sugu Sougoumarane 2019-09-02 19:29:29 -07:00
Родитель 470c2aaca1
Коммит 01b6c7a067
6 изменённых файлов: 222 добавлений и 191 удалений

Просмотреть файл

@ -1086,7 +1086,7 @@ type Journal struct {
LocalPosition string `protobuf:"bytes,4,opt,name=local_position,json=localPosition,proto3" json:"local_position,omitempty"`
ShardGtids []*ShardGtid `protobuf:"bytes,5,rep,name=shard_gtids,json=shardGtids,proto3" json:"shard_gtids,omitempty"`
Participants []*KeyspaceShard `protobuf:"bytes,6,rep,name=participants,proto3" json:"participants,omitempty"`
ReversedIds []int64 `protobuf:"varint,7,rep,packed,name=reversed_ids,json=reversedIds,proto3" json:"reversed_ids,omitempty"`
SourceWorkflows []string `protobuf:"bytes,7,rep,name=source_workflows,json=sourceWorkflows,proto3" json:"source_workflows,omitempty"`
XXX_NoUnkeyedLiteral struct{} `json:"-"`
XXX_unrecognized []byte `json:"-"`
XXX_sizecache int32 `json:"-"`
@ -1159,9 +1159,9 @@ func (m *Journal) GetParticipants() []*KeyspaceShard {
return nil
}
func (m *Journal) GetReversedIds() []int64 {
func (m *Journal) GetSourceWorkflows() []string {
if m != nil {
return m.ReversedIds
return m.SourceWorkflows
}
return nil
}
@ -1560,107 +1560,107 @@ func init() {
func init() { proto.RegisterFile("binlogdata.proto", fileDescriptor_5fd02bcb2e350dad) }
var fileDescriptor_5fd02bcb2e350dad = []byte{
// 1620 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0x4d, 0x73, 0xf3, 0x48,
0x11, 0x8e, 0x2d, 0xf9, 0xab, 0x95, 0x38, 0xca, 0xe4, 0x03, 0x93, 0x62, 0xa9, 0xac, 0x8a, 0x25,
0x21, 0x55, 0x38, 0x60, 0xe0, 0xe5, 0xb4, 0x2c, 0xfe, 0x50, 0x12, 0x27, 0xb2, 0x9d, 0x77, 0xac,
0x64, 0xa9, 0xbd, 0xa8, 0x14, 0x6b, 0x92, 0x88, 0xc8, 0x92, 0x5f, 0x69, 0xec, 0x90, 0x1f, 0x40,
0xf1, 0x03, 0xb8, 0xf2, 0x07, 0x38, 0xc3, 0x95, 0x2b, 0x77, 0x7e, 0x01, 0x27, 0xfe, 0x07, 0x35,
0x1f, 0x92, 0xad, 0x64, 0xd9, 0x37, 0x4b, 0x15, 0x07, 0x2e, 0xaa, 0x9e, 0x9e, 0xee, 0x9e, 0x9e,
0x67, 0x9e, 0xee, 0xd1, 0x80, 0x7e, 0xeb, 0x87, 0x41, 0x74, 0xef, 0xb9, 0xd4, 0x6d, 0xce, 0xe2,
0x88, 0x46, 0x08, 0x96, 0x9a, 0x7d, 0x6d, 0x41, 0xe3, 0xd9, 0x44, 0x4c, 0xec, 0x6b, 0x1f, 0xe6,
0x24, 0x7e, 0x96, 0x83, 0x3a, 0x8d, 0x66, 0xd1, 0xd2, 0xcb, 0x18, 0x40, 0xa5, 0xfb, 0xe0, 0xc6,
0x09, 0xa1, 0x68, 0x0f, 0xca, 0x93, 0xc0, 0x27, 0x21, 0x6d, 0x14, 0x0e, 0x0a, 0x47, 0x25, 0x2c,
0x47, 0x08, 0x81, 0x3a, 0x89, 0xc2, 0xb0, 0x51, 0xe4, 0x5a, 0x2e, 0x33, 0xdb, 0x84, 0xc4, 0x0b,
0x12, 0x37, 0x14, 0x61, 0x2b, 0x46, 0xc6, 0xbf, 0x14, 0xd8, 0xea, 0xf0, 0x3c, 0xec, 0xd8, 0x0d,
0x13, 0x77, 0x42, 0xfd, 0x28, 0x44, 0x67, 0x00, 0x09, 0x75, 0x29, 0x99, 0x92, 0x90, 0x26, 0x8d,
0xc2, 0x81, 0x72, 0xa4, 0xb5, 0x0e, 0x9b, 0x2b, 0x3b, 0x78, 0xe5, 0xd2, 0x1c, 0xa7, 0xf6, 0x78,
0xc5, 0x15, 0xb5, 0x40, 0x23, 0x0b, 0x12, 0x52, 0x87, 0x46, 0x8f, 0x24, 0x6c, 0xa8, 0x07, 0x85,
0x23, 0xad, 0xb5, 0xd5, 0x14, 0x1b, 0x34, 0xd9, 0x8c, 0xcd, 0x26, 0x30, 0x90, 0x4c, 0xde, 0xff,
0x7b, 0x11, 0x6a, 0x59, 0x34, 0x64, 0x41, 0x75, 0xe2, 0x52, 0x72, 0x1f, 0xc5, 0xcf, 0x7c, 0x9b,
0xf5, 0xd6, 0x4f, 0xde, 0x98, 0x48, 0xb3, 0x2b, 0xfd, 0x70, 0x16, 0x01, 0xfd, 0x18, 0x2a, 0x13,
0x81, 0x1e, 0x47, 0x47, 0x6b, 0x6d, 0xaf, 0x06, 0x93, 0xc0, 0xe2, 0xd4, 0x06, 0xe9, 0xa0, 0x24,
0x1f, 0x02, 0x0e, 0xd9, 0x3a, 0x66, 0xa2, 0xf1, 0xe7, 0x02, 0x54, 0xd3, 0xb8, 0x68, 0x1b, 0x36,
0x3b, 0x96, 0x73, 0x3d, 0xc4, 0x66, 0x77, 0x74, 0x36, 0xec, 0x7f, 0x65, 0xf6, 0xf4, 0x35, 0xb4,
0x0e, 0xd5, 0x8e, 0xe5, 0x74, 0xcc, 0xb3, 0xfe, 0x50, 0x2f, 0xa0, 0x0d, 0xa8, 0x75, 0x2c, 0xa7,
0x3b, 0x1a, 0x0c, 0xfa, 0xb6, 0x5e, 0x44, 0x9b, 0xa0, 0x75, 0x2c, 0x07, 0x8f, 0x2c, 0xab, 0xd3,
0xee, 0x5e, 0xea, 0x0a, 0xda, 0x85, 0xad, 0x8e, 0xe5, 0xf4, 0x06, 0x96, 0xd3, 0x33, 0xaf, 0xb0,
0xd9, 0x6d, 0xdb, 0x66, 0x4f, 0x57, 0x11, 0x40, 0x99, 0xa9, 0x7b, 0x96, 0x5e, 0x92, 0xf2, 0xd8,
0xb4, 0xf5, 0xb2, 0x0c, 0xd7, 0x1f, 0x8e, 0x4d, 0x6c, 0xeb, 0x15, 0x39, 0xbc, 0xbe, 0xea, 0xb5,
0x6d, 0x53, 0xaf, 0xca, 0x61, 0xcf, 0xb4, 0x4c, 0xdb, 0xd4, 0x6b, 0x17, 0x6a, 0xb5, 0xa8, 0x2b,
0x17, 0x6a, 0x55, 0xd1, 0x55, 0xe3, 0x8f, 0x05, 0xd8, 0x1d, 0xd3, 0x98, 0xb8, 0xd3, 0x4b, 0xf2,
0x8c, 0xdd, 0xf0, 0x9e, 0x60, 0xf2, 0x61, 0x4e, 0x12, 0x8a, 0xf6, 0xa1, 0x3a, 0x8b, 0x12, 0x9f,
0x61, 0xc7, 0x01, 0xae, 0xe1, 0x6c, 0x8c, 0x4e, 0xa0, 0xf6, 0x48, 0x9e, 0x9d, 0x98, 0xd9, 0x4b,
0xc0, 0x50, 0x33, 0x23, 0x64, 0x16, 0xa9, 0xfa, 0x28, 0xa5, 0x55, 0x7c, 0x95, 0x8f, 0xe3, 0x6b,
0xdc, 0xc1, 0xde, 0xcb, 0xa4, 0x92, 0x59, 0x14, 0x26, 0x04, 0x59, 0x80, 0x84, 0xa3, 0x43, 0x97,
0x67, 0xcb, 0xf3, 0xd3, 0x5a, 0x9f, 0x7c, 0x23, 0x01, 0xf0, 0xd6, 0xed, 0x4b, 0x95, 0xf1, 0x3b,
0xd8, 0x16, 0xeb, 0xd8, 0xee, 0x6d, 0x40, 0x92, 0xb7, 0x6c, 0x7d, 0x0f, 0xca, 0x94, 0x1b, 0x37,
0x8a, 0x07, 0xca, 0x51, 0x0d, 0xcb, 0xd1, 0xb7, 0xdd, 0xa1, 0x07, 0x3b, 0xf9, 0x95, 0xff, 0x27,
0xfb, 0xfb, 0x39, 0xa8, 0x78, 0x1e, 0x10, 0xb4, 0x03, 0xa5, 0xa9, 0x4b, 0x27, 0x0f, 0x72, 0x37,
0x62, 0xc0, 0xb6, 0x72, 0xe7, 0x07, 0x94, 0xc4, 0xfc, 0x08, 0x6b, 0x58, 0x8e, 0x8c, 0xbf, 0x14,
0xa0, 0x7c, 0xca, 0x45, 0xf4, 0x43, 0x28, 0xc5, 0x73, 0xb6, 0x59, 0x51, 0xeb, 0xfa, 0x6a, 0x06,
0x2c, 0x32, 0x16, 0xd3, 0xa8, 0x0f, 0xf5, 0x3b, 0x9f, 0x04, 0x1e, 0x2f, 0xdd, 0x41, 0xe4, 0x09,
0x56, 0xd4, 0x5b, 0x9f, 0xae, 0x3a, 0x88, 0x98, 0xcd, 0xd3, 0x9c, 0x21, 0x7e, 0xe1, 0x68, 0xbc,
0x83, 0x7a, 0xde, 0x82, 0x95, 0x93, 0x89, 0xb1, 0x33, 0x1a, 0x3a, 0x83, 0xfe, 0x78, 0xd0, 0xb6,
0xbb, 0xe7, 0xfa, 0x1a, 0xaf, 0x18, 0x73, 0x6c, 0x3b, 0xe6, 0xe9, 0xe9, 0x08, 0xdb, 0x7a, 0xc1,
0xf8, 0x53, 0x11, 0xd6, 0x05, 0x28, 0xe3, 0x68, 0x1e, 0x4f, 0x08, 0x3b, 0xc5, 0x47, 0xf2, 0x9c,
0xcc, 0xdc, 0x09, 0x49, 0x4f, 0x31, 0x1d, 0x33, 0x40, 0x92, 0x07, 0x37, 0xf6, 0xe4, 0xce, 0xc5,
0x00, 0xfd, 0x02, 0x34, 0x7e, 0x9a, 0xd4, 0xa1, 0xcf, 0x33, 0xc2, 0xcf, 0xb1, 0xde, 0xda, 0x59,
0x12, 0x9b, 0x9f, 0x15, 0xb5, 0x9f, 0x67, 0x04, 0x03, 0xcd, 0xe4, 0x7c, 0x35, 0xa8, 0x6f, 0xa8,
0x86, 0x25, 0x87, 0x4a, 0x39, 0x0e, 0x1d, 0x67, 0x07, 0x52, 0x96, 0x51, 0x5e, 0xa1, 0x97, 0x1e,
0x12, 0x6a, 0x42, 0x39, 0x0a, 0x1d, 0xcf, 0x0b, 0x1a, 0x15, 0x9e, 0xe6, 0x77, 0x56, 0x6d, 0x47,
0x61, 0xaf, 0x67, 0xb5, 0x05, 0x2d, 0x4a, 0x51, 0xd8, 0xf3, 0x02, 0xe3, 0x3d, 0xd4, 0x70, 0xf4,
0xd4, 0x7d, 0xe0, 0x09, 0x18, 0x50, 0xbe, 0x25, 0x77, 0x51, 0x4c, 0x24, 0xb3, 0x40, 0x76, 0x5e,
0x1c, 0x3d, 0x61, 0x39, 0x83, 0x0e, 0xa0, 0xe4, 0xde, 0xa5, 0xe4, 0xc8, 0x9b, 0x88, 0x09, 0xc3,
0x85, 0x2a, 0x8e, 0x9e, 0xf8, 0x39, 0xa1, 0x4f, 0x40, 0x20, 0xe2, 0x84, 0xee, 0x34, 0x85, 0xbb,
0xc6, 0x35, 0x43, 0x77, 0x4a, 0xd0, 0x3b, 0xd0, 0xe2, 0xe8, 0xc9, 0x99, 0xf0, 0xe5, 0x45, 0xe9,
0x68, 0xad, 0xdd, 0x1c, 0x9b, 0xd2, 0xe4, 0x30, 0xc4, 0xa9, 0x98, 0x18, 0xef, 0x01, 0x96, 0x64,
0xf8, 0xd8, 0x22, 0x3f, 0x60, 0xf0, 0x91, 0xc0, 0x4b, 0xe3, 0xaf, 0xcb, 0x94, 0x79, 0x04, 0x2c,
0xe7, 0x18, 0x10, 0x63, 0x76, 0xda, 0x67, 0xd4, 0xf7, 0xfe, 0x0b, 0x8e, 0x20, 0x50, 0xef, 0xa9,
0xef, 0x71, 0x72, 0xd4, 0x30, 0x97, 0x8d, 0x2f, 0xa0, 0x74, 0xc3, 0xc3, 0xbd, 0x03, 0x8d, 0x5b,
0x39, 0x4c, 0x9d, 0x16, 0x4d, 0x6e, 0x9b, 0xd9, 0xd2, 0x18, 0x92, 0x54, 0x4c, 0x8c, 0x36, 0x6c,
0x5c, 0xca, 0x65, 0xb9, 0xc1, 0xb7, 0xcf, 0xcb, 0xf8, 0x6b, 0x11, 0x2a, 0x17, 0xd1, 0x3c, 0x0e,
0xdd, 0x00, 0xd5, 0xa1, 0xe8, 0x7b, 0xdc, 0x4f, 0xc1, 0x45, 0xdf, 0x43, 0xbf, 0x86, 0xfa, 0xd4,
0xbf, 0x8f, 0x5d, 0xc6, 0x07, 0x41, 0x6d, 0x51, 0x9d, 0xdf, 0x5d, 0xcd, 0x6c, 0x90, 0x5a, 0x70,
0x7e, 0x6f, 0x4c, 0x57, 0x87, 0x2b, 0x8c, 0x55, 0x72, 0x8c, 0xfd, 0x0c, 0xea, 0x41, 0x34, 0x71,
0x03, 0x27, 0xeb, 0x97, 0x2a, 0x4f, 0x6a, 0x83, 0x6b, 0xaf, 0xd2, 0xa6, 0xf9, 0x02, 0x97, 0xd2,
0x1b, 0x71, 0x41, 0x9f, 0xc3, 0xfa, 0xcc, 0x8d, 0xa9, 0x3f, 0xf1, 0x67, 0x2e, 0xfb, 0xe3, 0x28,
0x73, 0xc7, 0x5c, 0xda, 0x39, 0xdc, 0x70, 0xce, 0x1c, 0x7d, 0x0a, 0xeb, 0x31, 0x59, 0x90, 0x38,
0x21, 0x9e, 0xc3, 0xd6, 0xad, 0x1c, 0x28, 0x47, 0x0a, 0xd6, 0x52, 0x5d, 0xdf, 0x4b, 0x8c, 0x7f,
0x16, 0xa1, 0x7c, 0x23, 0xd8, 0x75, 0x0c, 0x2a, 0xc7, 0x46, 0xfc, 0x4d, 0xec, 0xad, 0x2e, 0x22,
0x2c, 0x38, 0x30, 0xdc, 0x06, 0x7d, 0x0f, 0x6a, 0xd4, 0x9f, 0x92, 0x84, 0xba, 0xd3, 0x19, 0x07,
0x53, 0xc1, 0x4b, 0xc5, 0xd7, 0x71, 0x84, 0xfd, 0x32, 0xb0, 0x62, 0x15, 0xf0, 0x30, 0x11, 0xfd,
0x14, 0x6a, 0xac, 0x26, 0xf8, 0x1f, 0x4e, 0xa3, 0xc4, 0x8b, 0x6c, 0xe7, 0x45, 0x45, 0xf0, 0x65,
0x71, 0x35, 0x4e, 0xab, 0xec, 0x97, 0xa0, 0x71, 0x16, 0x4b, 0x27, 0xd1, 0x25, 0xf6, 0xf2, 0x5d,
0x22, 0xad, 0x16, 0x0c, 0xcb, 0xc6, 0x8a, 0x0e, 0xa1, 0xb4, 0xe0, 0x29, 0x55, 0xe4, 0x9f, 0xd6,
0xea, 0xe6, 0x38, 0xec, 0x62, 0x9e, 0x5d, 0x63, 0xbf, 0x15, 0x2c, 0x6a, 0x54, 0x5f, 0x5f, 0x63,
0x92, 0x60, 0x38, 0xb5, 0x61, 0x08, 0x4f, 0xe6, 0x71, 0xcc, 0xff, 0xe4, 0xfc, 0x29, 0x69, 0xec,
0x70, 0x28, 0x34, 0xa9, 0xb3, 0xfd, 0x29, 0x31, 0xfe, 0x50, 0x84, 0xfa, 0x8d, 0xb8, 0xeb, 0xd2,
0xfb, 0xf5, 0x0b, 0xd8, 0x26, 0x77, 0x77, 0x64, 0x42, 0xfd, 0x05, 0x71, 0x26, 0x6e, 0x10, 0x90,
0xd8, 0x91, 0x84, 0xd5, 0x5a, 0x9b, 0x4d, 0xf1, 0xcf, 0xdb, 0xe5, 0xfa, 0x7e, 0x0f, 0x6f, 0x65,
0xb6, 0x52, 0xe5, 0x21, 0x13, 0xb6, 0xfd, 0xe9, 0x94, 0x78, 0xbe, 0x4b, 0x57, 0x03, 0x88, 0x4e,
0xb5, 0x2b, 0xcb, 0xfe, 0xc6, 0x3e, 0x73, 0x29, 0x59, 0x86, 0xc9, 0x3c, 0xb2, 0x30, 0x9f, 0x31,
0x56, 0xc7, 0xf7, 0xd9, 0x95, 0xbd, 0x21, 0x3d, 0x6d, 0xae, 0xc4, 0x72, 0x32, 0xf7, 0x3b, 0xa0,
0xbe, 0xf8, 0x1d, 0x58, 0xb6, 0xec, 0xd2, 0xc7, 0x5a, 0xb6, 0xf1, 0x39, 0x6c, 0x66, 0x40, 0xc8,
0xeb, 0xfe, 0x18, 0xca, 0xfc, 0x28, 0xd3, 0x5e, 0x81, 0x5e, 0xb3, 0x0e, 0x4b, 0x0b, 0xe3, 0xf7,
0x45, 0x40, 0xa9, 0x7f, 0xf4, 0x94, 0xfc, 0x9f, 0x82, 0xb9, 0x03, 0x25, 0xae, 0x97, 0x48, 0x8a,
0x01, 0xc3, 0x21, 0x70, 0x13, 0x3a, 0x7b, 0xcc, 0x60, 0x14, 0xce, 0xef, 0xd9, 0x17, 0x93, 0x64,
0x1e, 0x50, 0x2c, 0x2d, 0x8c, 0xbf, 0x15, 0x60, 0x3b, 0x87, 0x83, 0xc4, 0x72, 0xd9, 0xfe, 0x0b,
0xff, 0xb9, 0xfd, 0xa3, 0x23, 0xa8, 0xce, 0x1e, 0xbf, 0xe1, 0x9a, 0xc8, 0x66, 0xbf, 0xb6, 0x8a,
0xbf, 0x0f, 0x6a, 0x1c, 0x3d, 0x25, 0x0d, 0x95, 0x7b, 0xae, 0xde, 0x89, 0x5c, 0xcf, 0x2e, 0xd6,
0xdc, 0x3e, 0x72, 0x17, 0xab, 0x98, 0x39, 0xfe, 0x15, 0x68, 0x2b, 0xf7, 0x33, 0xfb, 0x8d, 0xef,
0x9f, 0x0d, 0x47, 0xd8, 0xd4, 0xd7, 0x50, 0x15, 0xd4, 0xb1, 0x3d, 0xba, 0xd2, 0x0b, 0x4c, 0x32,
0x7f, 0x63, 0x76, 0xc5, 0xd3, 0x80, 0x49, 0x8e, 0x34, 0x52, 0x8e, 0xff, 0x51, 0x00, 0x58, 0x36,
0x24, 0xa4, 0x41, 0xe5, 0x7a, 0x78, 0x39, 0x1c, 0x7d, 0x39, 0x14, 0x01, 0xce, 0xec, 0x7e, 0x4f,
0x2f, 0xa0, 0x1a, 0x94, 0xc4, 0x5b, 0xa3, 0xc8, 0x56, 0x90, 0x0f, 0x0d, 0x85, 0xbd, 0x42, 0xb2,
0x57, 0x86, 0x8a, 0x2a, 0xa0, 0x64, 0x6f, 0x09, 0xf9, 0x78, 0x28, 0xb3, 0x80, 0xd8, 0xbc, 0xb2,
0xda, 0x5d, 0x53, 0xaf, 0xb0, 0x89, 0xec, 0x19, 0x01, 0x50, 0x4e, 0xdf, 0x10, 0xcc, 0x93, 0xbd,
0x3c, 0x80, 0xad, 0x33, 0xb2, 0xcf, 0x4d, 0xac, 0x6b, 0x4c, 0x87, 0x47, 0x5f, 0xea, 0xeb, 0x4c,
0x77, 0xda, 0x37, 0xad, 0x9e, 0xbe, 0xc1, 0x9e, 0x1e, 0xe7, 0x66, 0x1b, 0xdb, 0x1d, 0xb3, 0x6d,
0xeb, 0x75, 0x36, 0x73, 0xc3, 0x13, 0xdc, 0x64, 0xcb, 0x5c, 0x8c, 0xae, 0xf1, 0xb0, 0x6d, 0xe9,
0xfa, 0xf1, 0x21, 0x6c, 0xe4, 0xee, 0x1f, 0xb6, 0x96, 0xdd, 0xee, 0x58, 0xe6, 0x58, 0x5f, 0x63,
0xf2, 0xf8, 0xbc, 0x8d, 0x7b, 0x63, 0xbd, 0xd0, 0xf9, 0xd1, 0x57, 0x87, 0x0b, 0x9f, 0x92, 0x24,
0x69, 0xfa, 0xd1, 0x89, 0x90, 0x4e, 0xee, 0xa3, 0x93, 0x05, 0x3d, 0xe1, 0xcf, 0xe0, 0x93, 0x65,
0xf9, 0xdc, 0x96, 0xb9, 0xe6, 0x67, 0xff, 0x0e, 0x00, 0x00, 0xff, 0xff, 0x13, 0xef, 0x5d, 0xd6,
0x62, 0x0f, 0x00, 0x00,
// 1625 bytes of a gzipped FileDescriptorProto
0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xd4, 0x57, 0xcd, 0x72, 0xdb, 0xc8,
0x11, 0x16, 0x49, 0xf0, 0xaf, 0x21, 0x51, 0xd0, 0xe8, 0x27, 0x8c, 0x2a, 0x4e, 0xc9, 0xa8, 0x38,
0x92, 0x55, 0x15, 0x2a, 0x61, 0x12, 0xe7, 0xe4, 0x38, 0xfc, 0x81, 0x24, 0x4a, 0x20, 0x29, 0x0f,
0x21, 0x39, 0xe5, 0x0b, 0x0a, 0x22, 0x87, 0x12, 0x22, 0x10, 0xa0, 0x81, 0xa1, 0x14, 0x3d, 0x40,
0x2a, 0x0f, 0x90, 0x6b, 0x5e, 0x20, 0xe7, 0x5c, 0x93, 0xeb, 0xde, 0xf7, 0x09, 0xf6, 0xb4, 0xef,
0xb1, 0x35, 0x3f, 0x00, 0x09, 0xc9, 0x6b, 0xcb, 0x5b, 0xb5, 0x87, 0xbd, 0xa0, 0x7a, 0x7a, 0xba,
0x7b, 0x7a, 0xbe, 0xf9, 0x7a, 0x1a, 0x03, 0xda, 0xa5, 0xeb, 0x7b, 0xc1, 0xd5, 0xc8, 0xa1, 0x4e,
0x6d, 0x1a, 0x06, 0x34, 0x40, 0x30, 0xd7, 0x6c, 0xab, 0xb7, 0x34, 0x9c, 0x0e, 0xc5, 0xc4, 0xb6,
0xfa, 0x61, 0x46, 0xc2, 0x7b, 0x39, 0xa8, 0xd0, 0x60, 0x1a, 0xcc, 0xbd, 0xf4, 0x2e, 0x14, 0x5b,
0xd7, 0x4e, 0x18, 0x11, 0x8a, 0xb6, 0xa0, 0x30, 0xf4, 0x5c, 0xe2, 0xd3, 0x6a, 0x66, 0x27, 0xb3,
0x97, 0xc7, 0x72, 0x84, 0x10, 0x28, 0xc3, 0xc0, 0xf7, 0xab, 0x59, 0xae, 0xe5, 0x32, 0xb3, 0x8d,
0x48, 0x78, 0x4b, 0xc2, 0x6a, 0x4e, 0xd8, 0x8a, 0x91, 0xfe, 0x6d, 0x0e, 0xd6, 0x9a, 0x3c, 0x0f,
0x2b, 0x74, 0xfc, 0xc8, 0x19, 0x52, 0x37, 0xf0, 0xd1, 0x11, 0x40, 0x44, 0x1d, 0x4a, 0x26, 0xc4,
0xa7, 0x51, 0x35, 0xb3, 0x93, 0xdb, 0x53, 0xeb, 0xbb, 0xb5, 0x85, 0x1d, 0x3c, 0x72, 0xa9, 0x0d,
0x62, 0x7b, 0xbc, 0xe0, 0x8a, 0xea, 0xa0, 0x92, 0x5b, 0xe2, 0x53, 0x9b, 0x06, 0x37, 0xc4, 0xaf,
0x2a, 0x3b, 0x99, 0x3d, 0xb5, 0xbe, 0x56, 0x13, 0x1b, 0x34, 0xd8, 0x8c, 0xc5, 0x26, 0x30, 0x90,
0x44, 0xde, 0xfe, 0x2a, 0x0b, 0xe5, 0x24, 0x1a, 0x32, 0xa1, 0x34, 0x74, 0x28, 0xb9, 0x0a, 0xc2,
0x7b, 0xbe, 0xcd, 0x4a, 0xfd, 0xb7, 0x4f, 0x4c, 0xa4, 0xd6, 0x92, 0x7e, 0x38, 0x89, 0x80, 0x7e,
0x03, 0xc5, 0xa1, 0x40, 0x8f, 0xa3, 0xa3, 0xd6, 0xd7, 0x17, 0x83, 0x49, 0x60, 0x71, 0x6c, 0x83,
0x34, 0xc8, 0x45, 0x1f, 0x3c, 0x0e, 0xd9, 0x32, 0x66, 0xa2, 0xfe, 0x9f, 0x0c, 0x94, 0xe2, 0xb8,
0x68, 0x1d, 0x56, 0x9b, 0xa6, 0x7d, 0xde, 0xc3, 0x46, 0xab, 0x7f, 0xd4, 0xeb, 0xbc, 0x37, 0xda,
0xda, 0x12, 0x5a, 0x86, 0x52, 0xd3, 0xb4, 0x9b, 0xc6, 0x51, 0xa7, 0xa7, 0x65, 0xd0, 0x0a, 0x94,
0x9b, 0xa6, 0xdd, 0xea, 0x77, 0xbb, 0x1d, 0x4b, 0xcb, 0xa2, 0x55, 0x50, 0x9b, 0xa6, 0x8d, 0xfb,
0xa6, 0xd9, 0x6c, 0xb4, 0x4e, 0xb5, 0x1c, 0xda, 0x84, 0xb5, 0xa6, 0x69, 0xb7, 0xbb, 0xa6, 0xdd,
0x36, 0xce, 0xb0, 0xd1, 0x6a, 0x58, 0x46, 0x5b, 0x53, 0x10, 0x40, 0x81, 0xa9, 0xdb, 0xa6, 0x96,
0x97, 0xf2, 0xc0, 0xb0, 0xb4, 0x82, 0x0c, 0xd7, 0xe9, 0x0d, 0x0c, 0x6c, 0x69, 0x45, 0x39, 0x3c,
0x3f, 0x6b, 0x37, 0x2c, 0x43, 0x2b, 0xc9, 0x61, 0xdb, 0x30, 0x0d, 0xcb, 0xd0, 0xca, 0x27, 0x4a,
0x29, 0xab, 0xe5, 0x4e, 0x94, 0x52, 0x4e, 0x53, 0xf4, 0x7f, 0x65, 0x60, 0x73, 0x40, 0x43, 0xe2,
0x4c, 0x4e, 0xc9, 0x3d, 0x76, 0xfc, 0x2b, 0x82, 0xc9, 0x87, 0x19, 0x89, 0x28, 0xda, 0x86, 0xd2,
0x34, 0x88, 0x5c, 0x86, 0x1d, 0x07, 0xb8, 0x8c, 0x93, 0x31, 0x3a, 0x80, 0xf2, 0x0d, 0xb9, 0xb7,
0x43, 0x66, 0x2f, 0x01, 0x43, 0xb5, 0x84, 0x90, 0x49, 0xa4, 0xd2, 0x8d, 0x94, 0x16, 0xf1, 0xcd,
0x7d, 0x1e, 0x5f, 0x7d, 0x0c, 0x5b, 0x0f, 0x93, 0x8a, 0xa6, 0x81, 0x1f, 0x11, 0x64, 0x02, 0x12,
0x8e, 0x36, 0x9d, 0x9f, 0x2d, 0xcf, 0x4f, 0xad, 0x3f, 0xfb, 0x24, 0x01, 0xf0, 0xda, 0xe5, 0x43,
0x95, 0xfe, 0x77, 0x58, 0x17, 0xeb, 0x58, 0xce, 0xa5, 0x47, 0xa2, 0xa7, 0x6c, 0x7d, 0x0b, 0x0a,
0x94, 0x1b, 0x57, 0xb3, 0x3b, 0xb9, 0xbd, 0x32, 0x96, 0xa3, 0x2f, 0xdd, 0xe1, 0x08, 0x36, 0xd2,
0x2b, 0xff, 0x28, 0xfb, 0xfb, 0x03, 0x28, 0x78, 0xe6, 0x11, 0xb4, 0x01, 0xf9, 0x89, 0x43, 0x87,
0xd7, 0x72, 0x37, 0x62, 0xc0, 0xb6, 0x32, 0x76, 0x3d, 0x4a, 0x42, 0x7e, 0x84, 0x65, 0x2c, 0x47,
0xfa, 0x7f, 0x33, 0x50, 0x38, 0xe4, 0x22, 0xfa, 0x35, 0xe4, 0xc3, 0x19, 0xdb, 0xac, 0xa8, 0x75,
0x6d, 0x31, 0x03, 0x16, 0x19, 0x8b, 0x69, 0xd4, 0x81, 0xca, 0xd8, 0x25, 0xde, 0x88, 0x97, 0x6e,
0x37, 0x18, 0x09, 0x56, 0x54, 0xea, 0xcf, 0x17, 0x1d, 0x44, 0xcc, 0xda, 0x61, 0xca, 0x10, 0x3f,
0x70, 0xd4, 0x5f, 0x41, 0x25, 0x6d, 0xc1, 0xca, 0xc9, 0xc0, 0xd8, 0xee, 0xf7, 0xec, 0x6e, 0x67,
0xd0, 0x6d, 0x58, 0xad, 0x63, 0x6d, 0x89, 0x57, 0x8c, 0x31, 0xb0, 0x6c, 0xe3, 0xf0, 0xb0, 0x8f,
0x2d, 0x2d, 0xa3, 0xff, 0x3b, 0x0b, 0xcb, 0x02, 0x94, 0x41, 0x30, 0x0b, 0x87, 0x84, 0x9d, 0xe2,
0x0d, 0xb9, 0x8f, 0xa6, 0xce, 0x90, 0xc4, 0xa7, 0x18, 0x8f, 0x19, 0x20, 0xd1, 0xb5, 0x13, 0x8e,
0xe4, 0xce, 0xc5, 0x00, 0xfd, 0x11, 0x54, 0x7e, 0x9a, 0xd4, 0xa6, 0xf7, 0x53, 0xc2, 0xcf, 0xb1,
0x52, 0xdf, 0x98, 0x13, 0x9b, 0x9f, 0x15, 0xb5, 0xee, 0xa7, 0x04, 0x03, 0x4d, 0xe4, 0x74, 0x35,
0x28, 0x4f, 0xa8, 0x86, 0x39, 0x87, 0xf2, 0x29, 0x0e, 0xed, 0x27, 0x07, 0x52, 0x90, 0x51, 0x1e,
0xa1, 0x17, 0x1f, 0x12, 0xaa, 0x41, 0x21, 0xf0, 0xed, 0xd1, 0xc8, 0xab, 0x16, 0x79, 0x9a, 0x3f,
0x5b, 0xb4, 0xed, 0xfb, 0xed, 0xb6, 0xd9, 0x10, 0xb4, 0xc8, 0x07, 0x7e, 0x7b, 0xe4, 0xe9, 0x6f,
0xa1, 0x8c, 0x83, 0xbb, 0xd6, 0x35, 0x4f, 0x40, 0x87, 0xc2, 0x25, 0x19, 0x07, 0x21, 0x91, 0xcc,
0x02, 0x79, 0xf3, 0xe2, 0xe0, 0x0e, 0xcb, 0x19, 0xb4, 0x03, 0x79, 0x67, 0x1c, 0x93, 0x23, 0x6d,
0x22, 0x26, 0x74, 0x07, 0x4a, 0x38, 0xb8, 0xe3, 0xe7, 0x84, 0x9e, 0x81, 0x40, 0xc4, 0xf6, 0x9d,
0x49, 0x0c, 0x77, 0x99, 0x6b, 0x7a, 0xce, 0x84, 0xa0, 0x57, 0xa0, 0x86, 0xc1, 0x9d, 0x3d, 0xe4,
0xcb, 0x8b, 0xd2, 0x51, 0xeb, 0x9b, 0x29, 0x36, 0xc5, 0xc9, 0x61, 0x08, 0x63, 0x31, 0xd2, 0xdf,
0x02, 0xcc, 0xc9, 0xf0, 0xb9, 0x45, 0x7e, 0xc5, 0xe0, 0x23, 0xde, 0x28, 0x8e, 0xbf, 0x2c, 0x53,
0xe6, 0x11, 0xb0, 0x9c, 0x63, 0x40, 0x0c, 0xd8, 0x69, 0x1f, 0x51, 0x77, 0xf4, 0x03, 0x38, 0x82,
0x40, 0xb9, 0xa2, 0xee, 0x88, 0x93, 0xa3, 0x8c, 0xb9, 0xac, 0xbf, 0x81, 0xfc, 0x05, 0x0f, 0xf7,
0x0a, 0x54, 0x6e, 0x65, 0x33, 0x75, 0x5c, 0x34, 0xa9, 0x6d, 0x26, 0x4b, 0x63, 0x88, 0x62, 0x31,
0xd2, 0x1b, 0xb0, 0x72, 0x2a, 0x97, 0xe5, 0x06, 0x5f, 0x9e, 0x97, 0xfe, 0xbf, 0x2c, 0x14, 0x4f,
0x82, 0x59, 0xe8, 0x3b, 0x1e, 0xaa, 0x40, 0xd6, 0x1d, 0x71, 0xbf, 0x1c, 0xce, 0xba, 0x23, 0xf4,
0x17, 0xa8, 0x4c, 0xdc, 0xab, 0xd0, 0x61, 0x7c, 0x10, 0xd4, 0x16, 0xd5, 0xf9, 0xf3, 0xc5, 0xcc,
0xba, 0xb1, 0x05, 0xe7, 0xf7, 0xca, 0x64, 0x71, 0xb8, 0xc0, 0xd8, 0x5c, 0x8a, 0xb1, 0x2f, 0xa0,
0xe2, 0x05, 0x43, 0xc7, 0xb3, 0x93, 0xfb, 0x52, 0xe1, 0x49, 0xad, 0x70, 0xed, 0x59, 0x7c, 0x69,
0x3e, 0xc0, 0x25, 0xff, 0x44, 0x5c, 0xd0, 0x6b, 0x58, 0x9e, 0x3a, 0x21, 0x75, 0x87, 0xee, 0xd4,
0x61, 0x7f, 0x1c, 0x05, 0xee, 0x98, 0x4a, 0x3b, 0x85, 0x1b, 0x4e, 0x99, 0xa3, 0x97, 0xa0, 0x45,
0xfc, 0x2e, 0xb0, 0xef, 0x82, 0xf0, 0x66, 0xec, 0x05, 0x77, 0x51, 0xb5, 0xc8, 0xf3, 0x5f, 0x15,
0xfa, 0x77, 0xb1, 0x5a, 0xff, 0x26, 0x0b, 0x85, 0x0b, 0xc1, 0xb2, 0x7d, 0x50, 0x38, 0x46, 0xe2,
0xaf, 0x62, 0x6b, 0x71, 0x31, 0x61, 0xc1, 0x01, 0xe2, 0x36, 0xe8, 0x17, 0x50, 0xa6, 0xee, 0x84,
0x44, 0xd4, 0x99, 0x4c, 0x39, 0xa8, 0x39, 0x3c, 0x57, 0x7c, 0x8c, 0x2b, 0xec, 0xd7, 0x81, 0x15,
0xad, 0x80, 0x89, 0x89, 0xe8, 0x77, 0x50, 0x66, 0xb5, 0xc1, 0xff, 0x74, 0xaa, 0x79, 0x5e, 0x6c,
0x1b, 0x0f, 0x2a, 0x83, 0x2f, 0x8b, 0x4b, 0x61, 0x5c, 0x6d, 0x7f, 0x02, 0x95, 0xb3, 0x59, 0x3a,
0x89, 0xdb, 0x62, 0x2b, 0x7d, 0x5b, 0xc4, 0x55, 0x83, 0x61, 0x7e, 0xc1, 0xa2, 0x5d, 0xc8, 0xdf,
0xf2, 0x94, 0x8a, 0xf2, 0x8f, 0x6b, 0x71, 0x73, 0x1c, 0x7e, 0x31, 0xcf, 0xda, 0xd9, 0xdf, 0x04,
0x9b, 0xaa, 0xa5, 0xc7, 0xed, 0x4c, 0x12, 0x0d, 0xc7, 0x36, 0xe8, 0x39, 0x2c, 0x0f, 0x67, 0x61,
0xc8, 0xff, 0xe8, 0xdc, 0x09, 0xa9, 0x6e, 0x70, 0x28, 0x54, 0xa9, 0xb3, 0xdc, 0x09, 0xd1, 0xff,
0x99, 0x85, 0xca, 0x85, 0xe8, 0x79, 0x71, 0x9f, 0x7d, 0x03, 0xeb, 0x64, 0x3c, 0x26, 0x43, 0xea,
0xde, 0x12, 0x7b, 0xe8, 0x78, 0x1e, 0x09, 0x6d, 0x49, 0x5c, 0xb5, 0xbe, 0x5a, 0x13, 0xff, 0xbe,
0x2d, 0xae, 0xef, 0xb4, 0xf1, 0x5a, 0x62, 0x2b, 0x55, 0x23, 0x64, 0xc0, 0xba, 0x3b, 0x99, 0x90,
0x91, 0xeb, 0xd0, 0xc5, 0x00, 0xe2, 0xc6, 0xda, 0x94, 0xe5, 0x7f, 0x61, 0x1d, 0x39, 0x94, 0xcc,
0xc3, 0x24, 0x1e, 0x49, 0x98, 0x17, 0x8c, 0xdd, 0xe1, 0x55, 0xd2, 0xba, 0x57, 0xa4, 0xa7, 0xc5,
0x95, 0x58, 0x4e, 0xa6, 0x7e, 0x0b, 0x94, 0x07, 0xbf, 0x05, 0xf3, 0xab, 0x3b, 0xff, 0xb9, 0xab,
0x5b, 0x7f, 0x0d, 0xab, 0x09, 0x10, 0xb2, 0xed, 0xef, 0x43, 0x81, 0x1f, 0x65, 0x7c, 0x67, 0xa0,
0xc7, 0xac, 0xc3, 0xd2, 0x42, 0xff, 0x47, 0x16, 0x50, 0xec, 0x1f, 0xdc, 0x45, 0x3f, 0x51, 0x30,
0x37, 0x20, 0xcf, 0xf5, 0x12, 0x49, 0x31, 0x60, 0x38, 0x78, 0x4e, 0x44, 0xa7, 0x37, 0x09, 0x8c,
0xc2, 0xf9, 0x2d, 0xfb, 0x62, 0x12, 0xcd, 0x3c, 0x8a, 0xa5, 0x85, 0xfe, 0xff, 0x0c, 0xac, 0xa7,
0x70, 0x90, 0x58, 0xce, 0xdb, 0x40, 0xe6, 0xfb, 0xdb, 0x00, 0xda, 0x83, 0xd2, 0xf4, 0xe6, 0x13,
0xed, 0x22, 0x99, 0xfd, 0x68, 0x15, 0xff, 0x12, 0x94, 0x90, 0xdd, 0x26, 0x0a, 0xf7, 0x5c, 0xec,
0x8d, 0x5c, 0xcf, 0x1a, 0x6c, 0x6a, 0x1f, 0xa9, 0x06, 0x2b, 0x66, 0xf6, 0xff, 0x0c, 0xea, 0x42,
0x9f, 0x66, 0xbf, 0xf3, 0x9d, 0xa3, 0x5e, 0x1f, 0x1b, 0xda, 0x12, 0x2a, 0x81, 0x32, 0xb0, 0xfa,
0x67, 0x5a, 0x86, 0x49, 0xc6, 0x5f, 0x8d, 0x96, 0x78, 0x22, 0x30, 0xc9, 0x96, 0x46, 0xb9, 0xfd,
0xaf, 0x33, 0x00, 0xf3, 0x0b, 0x09, 0xa9, 0x50, 0x3c, 0xef, 0x9d, 0xf6, 0xfa, 0xef, 0x7a, 0x22,
0xc0, 0x91, 0xd5, 0x69, 0x6b, 0x19, 0x54, 0x86, 0xbc, 0x78, 0x73, 0x64, 0xd9, 0x0a, 0xf2, 0xc1,
0x91, 0x63, 0xaf, 0x91, 0xe4, 0xb5, 0xa1, 0xa0, 0x22, 0xe4, 0x92, 0x37, 0x85, 0x7c, 0x44, 0x14,
0x58, 0x40, 0x6c, 0x9c, 0x99, 0x8d, 0x96, 0xa1, 0x15, 0xd9, 0x44, 0xf2, 0x9c, 0x00, 0x28, 0xc4,
0x6f, 0x09, 0xe6, 0xc9, 0x5e, 0x20, 0xc0, 0xd6, 0xe9, 0x5b, 0xc7, 0x06, 0xd6, 0x54, 0xa6, 0xc3,
0xfd, 0x77, 0xda, 0x32, 0xd3, 0x1d, 0x76, 0x0c, 0xb3, 0xad, 0xad, 0xb0, 0x27, 0xc8, 0xb1, 0xd1,
0xc0, 0x56, 0xd3, 0x68, 0x58, 0x5a, 0x85, 0xcd, 0x5c, 0xf0, 0x04, 0x57, 0xd9, 0x32, 0x27, 0xfd,
0x73, 0xdc, 0x6b, 0x98, 0x9a, 0xb6, 0xbf, 0x0b, 0x2b, 0xa9, 0x3e, 0xc4, 0xd6, 0xb2, 0x1a, 0x4d,
0xd3, 0x18, 0x68, 0x4b, 0x4c, 0x1e, 0x1c, 0x37, 0x70, 0x7b, 0xa0, 0x65, 0x9a, 0x2f, 0xdf, 0xef,
0xde, 0xba, 0x94, 0x44, 0x51, 0xcd, 0x0d, 0x0e, 0x84, 0x74, 0x70, 0x15, 0x1c, 0xdc, 0xd2, 0x03,
0xfe, 0x1c, 0x3e, 0x98, 0x97, 0xcf, 0x65, 0x81, 0x6b, 0x7e, 0xff, 0x5d, 0x00, 0x00, 0x00, 0xff,
0xff, 0x49, 0x0f, 0x06, 0xcd, 0x6a, 0x0f, 0x00, 0x00,
}

Просмотреть файл

@ -29,7 +29,6 @@ import (
"github.com/golang/protobuf/proto"
"golang.org/x/net/context"
"vitess.io/vitess/go/sqltypes"
"vitess.io/vitess/go/sync2"
"vitess.io/vitess/go/vt/binlog/binlogplayer"
"vitess.io/vitess/go/vt/concurrency"
"vitess.io/vitess/go/vt/key"
@ -62,15 +61,16 @@ const (
// migrater contains the metadata for migrating read and write traffic
// for vreplication streams.
type migrater struct {
migrationType binlogdatapb.MigrationType
wr *Wrangler
workflow string
id int64
sources map[string]*miSource
targets map[string]*miTarget
sourceKeyspace string
targetKeyspace string
tables []string
migrationType binlogdatapb.MigrationType
wr *Wrangler
workflow string
id int64
sources map[string]*miSource
targets map[string]*miTarget
sourceKeyspace string
targetKeyspace string
tables []string
sourceWorkflows []string
}
// miTarget contains the metadata for each migration target.
@ -147,6 +147,11 @@ func (wr *Wrangler) MigrateWrites(ctx context.Context, targetKeyspace, workflow
}
if !journalsExist {
mi.wr.Logger().Infof("No previous journals were found. Proceeding normally.")
sm := &streamMigrater{mi: mi}
tabletStreams, err := sm.stopStreams(ctx)
if err != nil {
return 0, err
}
if err := mi.stopSourceWrites(ctx); err != nil {
mi.cancelMigration(ctx)
return 0, err
@ -155,6 +160,10 @@ func (wr *Wrangler) MigrateWrites(ctx context.Context, targetKeyspace, workflow
mi.cancelMigration(ctx)
return 0, err
}
mi.sourceWorkflows, err = sm.migrateStreams(ctx, tabletStreams)
if err != nil {
return 0, err
}
} else {
mi.wr.Logger().Infof("Journals were found. Completing the left over steps.")
// Need to gather positions in case all journals were not created.
@ -176,6 +185,10 @@ func (wr *Wrangler) MigrateWrites(ctx context.Context, targetKeyspace, workflow
if err := mi.changeRouting(ctx); err != nil {
return 0, err
}
sm := &streamMigrater{mi: mi}
if err := sm.finalize(ctx, mi.sourceWorkflows); err != nil {
return 0, err
}
mi.deleteTargetVReplication(ctx)
return mi.id, nil
}
@ -461,20 +474,32 @@ func (mi *migrater) migrateShardReads(ctx context.Context, cells []string, serve
}
func (mi *migrater) checkJournals(ctx context.Context) (journalsExist bool, err error) {
var exist sync2.AtomicBool
var mu sync.Mutex
journal := &binlogdatapb.Journal{}
var exists bool
err = mi.forAllSources(func(source *miSource) error {
statement := fmt.Sprintf("select 1 from _vt.resharding_journal where id=%v", mi.id)
statement := fmt.Sprintf("select val from _vt.resharding_journal where id=%v", mi.id)
p3qr, err := mi.wr.tmc.VReplicationExec(ctx, source.master.Tablet, statement)
if err != nil {
return err
}
if len(p3qr.Rows) >= 1 {
exist.Set(true)
if len(p3qr.Rows) != 0 {
qr := sqltypes.Proto3ToResult(p3qr)
mu.Lock()
defer mu.Unlock()
if !exists {
if err := proto.UnmarshalText(qr.Rows[0][0].ToString(), journal); err != nil {
return err
}
exists = true
}
source.journaled = true
}
return nil
})
return exist.Get(), err
mi.sourceWorkflows = journal.SourceWorkflows
return exists, err
}
func (mi *migrater) stopSourceWrites(ctx context.Context) error {
@ -545,6 +570,9 @@ func (mi *migrater) cancelMigration(ctx context.Context) {
mi.wr.Logger().Errorf("Cancel migration failed:", err)
}
sm := &streamMigrater{mi: mi}
sm.cancelMigration(ctx)
err = mi.forAllTargets(func(target *miTarget) error {
query := fmt.Sprintf("update _vt.vreplication set state='Running', message='' where db_name=%s and workflow=%s", encodeString(target.master.DbName()), encodeString(mi.workflow))
_, err := mi.wr.tmc.VReplicationExec(ctx, target.master.Tablet, query)

Просмотреть файл

@ -207,7 +207,7 @@ func (sm *streamMigrater) stopSourceStreams(ctx context.Context, streams map[str
}
func (sm *streamMigrater) syncSourceStreams(ctx context.Context, streams map[string][]*vrStream) (map[string]mysql.Position, error) {
var stopPositions map[string]mysql.Position
stopPositions := make(map[string]mysql.Position)
for _, tabletStreams := range streams {
for _, vrs := range tabletStreams {
key := fmt.Sprintf("%s:%s", vrs.bls.Keyspace, vrs.bls.Shard)
@ -441,13 +441,14 @@ func (sm *streamMigrater) createTargetStreams(ctx context.Context, tmpl []*vrStr
})
}
func (sm *streamMigrater) cancelMigration(ctx context.Context) error {
func (sm *streamMigrater) cancelMigration(ctx context.Context) {
if sm.mi.migrationType == binlogdatapb.MigrationType_TABLES {
return nil
return
}
tabletStreams, err := sm.readSourceStreamsForCancel(ctx)
if err != nil {
return err
sm.mi.wr.Logger().Errorf("Cancel migration failed: could not read streams metadata: %v", err)
return
}
workflowList := stringListify(tabletStreamWorkflows(tabletStreams))
err = sm.mi.forAllTargets(func(target *miTarget) error {
@ -456,13 +457,16 @@ func (sm *streamMigrater) cancelMigration(ctx context.Context) error {
return err
})
if err != nil {
return err
sm.mi.wr.Logger().Errorf("Cancel migration failed: could not delete migrated streams: %v", err)
}
return sm.mi.forAllSources(func(source *miSource) error {
err = sm.mi.forAllSources(func(source *miSource) error {
query := fmt.Sprintf("update _vt.vreplication set state='Running', stop_pos=null, message='' where id in %s", workflowList)
_, err := sm.mi.wr.VReplicationExec(ctx, source.master.Alias, query)
return err
})
if err != nil {
sm.mi.wr.Logger().Errorf("Cancel migration failed: could not restart source streams: %v", err)
}
}
func (sm *streamMigrater) readSourceStreamsForCancel(ctx context.Context) ([]*vrStream, error) {

Просмотреть файл

@ -240,7 +240,7 @@ message Journal {
string local_position = 4;
repeated ShardGtid shard_gtids = 5;
repeated KeyspaceShard participants = 6;
repeated int64 reversed_ids = 7;
repeated string source_workflows = 7;
}
// VEvent represents a vstream event

Различия файлов скрыты, потому что одна или несколько строк слишком длинны

Просмотреть файл

@ -8,7 +8,6 @@ from google.protobuf import descriptor as _descriptor
from google.protobuf import message as _message
from google.protobuf import reflection as _reflection
from google.protobuf import symbol_database as _symbol_database
from google.protobuf import descriptor_pb2
# @@protoc_insertion_point(imports)
_sym_db = _symbol_database.Default()
@ -20,6 +19,7 @@ DESCRIPTOR = _descriptor.FileDescriptor(
name='vtrpc.proto',
package='vtrpc',
syntax='proto3',
serialized_options=_b('\n\017io.vitess.protoZ\"vitess.io/vitess/go/vt/proto/vtrpc'),
serialized_pb=_b('\n\x0bvtrpc.proto\x12\x05vtrpc\"F\n\x08\x43\x61llerID\x12\x11\n\tprincipal\x18\x01 \x01(\t\x12\x11\n\tcomponent\x18\x02 \x01(\t\x12\x14\n\x0csubcomponent\x18\x03 \x01(\t\"c\n\x08RPCError\x12+\n\x0blegacy_code\x18\x01 \x01(\x0e\x32\x16.vtrpc.LegacyErrorCode\x12\x0f\n\x07message\x18\x02 \x01(\t\x12\x19\n\x04\x63ode\x18\x03 \x01(\x0e\x32\x0b.vtrpc.Code*\xb6\x02\n\x04\x43ode\x12\x06\n\x02OK\x10\x00\x12\x0c\n\x08\x43\x41NCELED\x10\x01\x12\x0b\n\x07UNKNOWN\x10\x02\x12\x14\n\x10INVALID_ARGUMENT\x10\x03\x12\x15\n\x11\x44\x45\x41\x44LINE_EXCEEDED\x10\x04\x12\r\n\tNOT_FOUND\x10\x05\x12\x12\n\x0e\x41LREADY_EXISTS\x10\x06\x12\x15\n\x11PERMISSION_DENIED\x10\x07\x12\x13\n\x0fUNAUTHENTICATED\x10\x10\x12\x16\n\x12RESOURCE_EXHAUSTED\x10\x08\x12\x17\n\x13\x46\x41ILED_PRECONDITION\x10\t\x12\x0b\n\x07\x41\x42ORTED\x10\n\x12\x10\n\x0cOUT_OF_RANGE\x10\x0b\x12\x11\n\rUNIMPLEMENTED\x10\x0c\x12\x0c\n\x08INTERNAL\x10\r\x12\x0f\n\x0bUNAVAILABLE\x10\x0e\x12\r\n\tDATA_LOSS\x10\x0f*\xe8\x02\n\x0fLegacyErrorCode\x12\x12\n\x0eSUCCESS_LEGACY\x10\x00\x12\x14\n\x10\x43\x41NCELLED_LEGACY\x10\x01\x12\x18\n\x14UNKNOWN_ERROR_LEGACY\x10\x02\x12\x14\n\x10\x42\x41\x44_INPUT_LEGACY\x10\x03\x12\x1c\n\x18\x44\x45\x41\x44LINE_EXCEEDED_LEGACY\x10\x04\x12\x1a\n\x16INTEGRITY_ERROR_LEGACY\x10\x05\x12\x1c\n\x18PERMISSION_DENIED_LEGACY\x10\x06\x12\x1d\n\x19RESOURCE_EXHAUSTED_LEGACY\x10\x07\x12\x1b\n\x17QUERY_NOT_SERVED_LEGACY\x10\x08\x12\x14\n\x10NOT_IN_TX_LEGACY\x10\t\x12\x19\n\x15INTERNAL_ERROR_LEGACY\x10\n\x12\x1a\n\x16TRANSIENT_ERROR_LEGACY\x10\x0b\x12\x1a\n\x16UNAUTHENTICATED_LEGACY\x10\x0c\x42\x35\n\x0fio.vitess.protoZ\"vitess.io/vitess/go/vt/proto/vtrpcb\x06proto3')
)
@ -31,75 +31,75 @@ _CODE = _descriptor.EnumDescriptor(
values=[
_descriptor.EnumValueDescriptor(
name='OK', index=0, number=0,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='CANCELED', index=1, number=1,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='UNKNOWN', index=2, number=2,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='INVALID_ARGUMENT', index=3, number=3,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='DEADLINE_EXCEEDED', index=4, number=4,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='NOT_FOUND', index=5, number=5,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='ALREADY_EXISTS', index=6, number=6,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='PERMISSION_DENIED', index=7, number=7,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='UNAUTHENTICATED', index=8, number=16,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='RESOURCE_EXHAUSTED', index=9, number=8,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='FAILED_PRECONDITION', index=10, number=9,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='ABORTED', index=11, number=10,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='OUT_OF_RANGE', index=12, number=11,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='UNIMPLEMENTED', index=13, number=12,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='INTERNAL', index=14, number=13,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='UNAVAILABLE', index=15, number=14,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='DATA_LOSS', index=16, number=15,
options=None,
serialized_options=None,
type=None),
],
containing_type=None,
options=None,
serialized_options=None,
serialized_start=196,
serialized_end=506,
)
@ -114,59 +114,59 @@ _LEGACYERRORCODE = _descriptor.EnumDescriptor(
values=[
_descriptor.EnumValueDescriptor(
name='SUCCESS_LEGACY', index=0, number=0,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='CANCELLED_LEGACY', index=1, number=1,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='UNKNOWN_ERROR_LEGACY', index=2, number=2,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='BAD_INPUT_LEGACY', index=3, number=3,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='DEADLINE_EXCEEDED_LEGACY', index=4, number=4,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='INTEGRITY_ERROR_LEGACY', index=5, number=5,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='PERMISSION_DENIED_LEGACY', index=6, number=6,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='RESOURCE_EXHAUSTED_LEGACY', index=7, number=7,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='QUERY_NOT_SERVED_LEGACY', index=8, number=8,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='NOT_IN_TX_LEGACY', index=9, number=9,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='INTERNAL_ERROR_LEGACY', index=10, number=10,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='TRANSIENT_ERROR_LEGACY', index=11, number=11,
options=None,
serialized_options=None,
type=None),
_descriptor.EnumValueDescriptor(
name='UNAUTHENTICATED_LEGACY', index=12, number=12,
options=None,
serialized_options=None,
type=None),
],
containing_type=None,
options=None,
serialized_options=None,
serialized_start=509,
serialized_end=869,
)
@ -219,28 +219,28 @@ _CALLERID = _descriptor.Descriptor(
has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
options=None, file=DESCRIPTOR),
serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='component', full_name='vtrpc.CallerID.component', index=1,
number=2, type=9, cpp_type=9, label=1,
has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
options=None, file=DESCRIPTOR),
serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='subcomponent', full_name='vtrpc.CallerID.subcomponent', index=2,
number=3, type=9, cpp_type=9, label=1,
has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
options=None, file=DESCRIPTOR),
serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
nested_types=[],
enum_types=[
],
options=None,
serialized_options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
@ -264,28 +264,28 @@ _RPCERROR = _descriptor.Descriptor(
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
options=None, file=DESCRIPTOR),
serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='message', full_name='vtrpc.RPCError.message', index=1,
number=2, type=9, cpp_type=9, label=1,
has_default_value=False, default_value=_b("").decode('utf-8'),
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
options=None, file=DESCRIPTOR),
serialized_options=None, file=DESCRIPTOR),
_descriptor.FieldDescriptor(
name='code', full_name='vtrpc.RPCError.code', index=2,
number=3, type=14, cpp_type=8, label=1,
has_default_value=False, default_value=0,
message_type=None, enum_type=None, containing_type=None,
is_extension=False, extension_scope=None,
options=None, file=DESCRIPTOR),
serialized_options=None, file=DESCRIPTOR),
],
extensions=[
],
nested_types=[],
enum_types=[
],
options=None,
serialized_options=None,
is_extendable=False,
syntax='proto3',
extension_ranges=[],
@ -318,6 +318,5 @@ RPCError = _reflection.GeneratedProtocolMessageType('RPCError', (_message.Messag
_sym_db.RegisterMessage(RPCError)
DESCRIPTOR.has_options = True
DESCRIPTOR._options = _descriptor._ParseOptions(descriptor_pb2.FileOptions(), _b('\n\017io.vitess.protoZ\"vitess.io/vitess/go/vt/proto/vtrpc'))
DESCRIPTOR._options = None
# @@protoc_insertion_point(module_scope)