diff --git a/dm/ctl/master/operate_source.go b/dm/ctl/master/operate_source.go index bfbd316531..6d0b59d3d2 100644 --- a/dm/ctl/master/operate_source.go +++ b/dm/ctl/master/operate_source.go @@ -96,15 +96,20 @@ func operateSourceFunc(cmd *cobra.Command, _ []string) (err error) { return } - contents := make([]string, len(cmd.Flags().Args())-1) + contents := make([]string, 0, len(cmd.Flags().Args())-1) + sourceID := make([]string, 0, len(cmd.Flags().Args())-1) for i := 1; i < len(cmd.Flags().Args()); i++ { - configFile := cmd.Flags().Arg(i) + arg := cmd.Flags().Arg(i) var content []byte - content, err = common.GetFileContent(configFile) + content, err = common.GetFileContent(arg) if err != nil { + if op == pb.SourceOp_StopSource { + sourceID = append(sourceID, arg) + continue + } return } - contents[i-1] = string(content) + contents = append(contents, string(content)) } ctx, cancel := context.WithCancel(context.Background()) @@ -112,8 +117,9 @@ func operateSourceFunc(cmd *cobra.Command, _ []string) (err error) { cli := common.MasterClient() resp, err := cli.OperateSource(ctx, &pb.OperateSourceRequest{ - Config: contents, - Op: op, + Config: contents, + Op: op, + SourceID: sourceID, }) if err != nil { return diff --git a/dm/master/server.go b/dm/master/server.go index e9f53e7c9e..2e0246150e 100644 --- a/dm/master/server.go +++ b/dm/master/server.go @@ -1469,9 +1469,17 @@ func (s *Server) OperateSource(ctx context.Context, req *pb.OperateSourceRequest resp.Msg = "Update worker config is not supported by dm-ha now" return resp, nil case pb.SourceOp_StopSource: + toRemove := make([]string, 0, len(cfgs)+len(req.SourceID)) + for _, sid := range req.SourceID { + toRemove = append(toRemove, sid) + } for _, cfg := range cfgs { - boundM[cfg.SourceID] = s.scheduler.GetWorkerBySource(cfg.SourceID) - err := s.scheduler.RemoveSourceCfg(cfg.SourceID) + toRemove = append(toRemove, cfg.SourceID) + } + + for _, sid := range toRemove { + boundM[sid] = s.scheduler.GetWorkerBySource(sid) + err := s.scheduler.RemoveSourceCfg(sid) // TODO(lance6716): // user could not copy-paste same command if encounter error halfway: // `operate-source stop correct-id-1 wrong-id-2` diff --git a/dm/pb/dmmaster.pb.go b/dm/pb/dmmaster.pb.go index fdc6bdb44f..d8d82660c2 100644 --- a/dm/pb/dmmaster.pb.go +++ b/dm/pb/dmmaster.pb.go @@ -1847,8 +1847,9 @@ func (m *CheckTaskResponse) GetMsg() string { } type OperateSourceRequest struct { - Op SourceOp `protobuf:"varint,1,opt,name=op,proto3,enum=pb.SourceOp" json:"op,omitempty"` - Config []string `protobuf:"bytes,2,rep,name=config,proto3" json:"config,omitempty"` + Op SourceOp `protobuf:"varint,1,opt,name=op,proto3,enum=pb.SourceOp" json:"op,omitempty"` + Config []string `protobuf:"bytes,2,rep,name=config,proto3" json:"config,omitempty"` + SourceID []string `protobuf:"bytes,3,rep,name=sourceID,proto3" json:"sourceID,omitempty"` } func (m *OperateSourceRequest) Reset() { *m = OperateSourceRequest{} } @@ -1898,6 +1899,13 @@ func (m *OperateSourceRequest) GetConfig() []string { return nil } +func (m *OperateSourceRequest) GetSourceID() []string { + if m != nil { + return m.SourceID + } + return nil +} + type OperateSourceResponse struct { Result bool `protobuf:"varint,1,opt,name=result,proto3" json:"result,omitempty"` Msg string `protobuf:"bytes,2,opt,name=msg,proto3" json:"msg,omitempty"` @@ -3209,134 +3217,135 @@ func init() { func init() { proto.RegisterFile("dmmaster.proto", fileDescriptor_f9bef11f2a341f03) } var fileDescriptor_f9bef11f2a341f03 = []byte{ - // 2022 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0xcd, 0x6f, 0xe3, 0xc6, - 0x15, 0x17, 0x25, 0xaf, 0x2d, 0x3f, 0xaf, 0x1d, 0x79, 0xd6, 0x96, 0x65, 0xae, 0x57, 0xeb, 0x4c, - 0x92, 0xad, 0x61, 0x14, 0xeb, 0xae, 0xd3, 0xd3, 0x02, 0x29, 0x90, 0xb5, 0x9c, 0xc4, 0xa8, 0x36, - 0xf6, 0x52, 0x35, 0x8a, 0xa0, 0x40, 0x11, 0x8a, 0x1a, 0xc9, 0x84, 0x29, 0x92, 0x26, 0x29, 0xbb, - 0xc6, 0x22, 0x28, 0xd0, 0x43, 0x8f, 0x6d, 0x81, 0x1e, 0x72, 0xec, 0xa1, 0xd7, 0xfe, 0x21, 0x39, - 0x06, 0xe8, 0xa5, 0xc7, 0x62, 0xb7, 0x7f, 0x48, 0x31, 0x6f, 0x86, 0xe4, 0xf0, 0x43, 0xea, 0x6a, - 0x81, 0xfa, 0xc6, 0x37, 0x1f, 0xef, 0xfd, 0xe6, 0xbd, 0x37, 0xef, 0x63, 0x08, 0x6b, 0x83, 0xf1, - 0xd8, 0x0c, 0x23, 0x16, 0x3c, 0xf5, 0x03, 0x2f, 0xf2, 0x48, 0xd5, 0xef, 0xeb, 0x6b, 0x83, 0xf1, - 0x8d, 0x17, 0x5c, 0xc6, 0x63, 0xfa, 0xce, 0xc8, 0xf3, 0x46, 0x0e, 0x3b, 0x30, 0x7d, 0xfb, 0xc0, - 0x74, 0x5d, 0x2f, 0x32, 0x23, 0xdb, 0x73, 0x43, 0x31, 0x4b, 0xaf, 0x60, 0xfb, 0xa5, 0x3d, 0x0a, - 0xcc, 0x88, 0xfd, 0x1a, 0x37, 0x19, 0xcc, 0x31, 0x6f, 0x0d, 0x76, 0x35, 0x61, 0x61, 0x44, 0xda, - 0x00, 0x2f, 0x6c, 0xd7, 0xf1, 0x46, 0x5f, 0x9b, 0x63, 0xd6, 0xd2, 0x76, 0xb5, 0xbd, 0x65, 0x43, - 0x19, 0x21, 0x3b, 0xb0, 0x2c, 0xa8, 0x33, 0x2f, 0x6c, 0x55, 0x77, 0xb5, 0xbd, 0x55, 0x23, 0x1d, - 0x20, 0x4d, 0x58, 0x0c, 0xbd, 0x49, 0x60, 0xb1, 0x56, 0x0d, 0x77, 0x4a, 0x8a, 0x9e, 0x41, 0xfb, - 0xdc, 0x1f, 0x64, 0x25, 0x1e, 0x79, 0xee, 0xd0, 0x1e, 0xc5, 0x72, 0x9b, 0xb0, 0x68, 0xe1, 0x80, - 0x94, 0x29, 0x29, 0x85, 0x63, 0x35, 0xc3, 0xf1, 0x5b, 0x68, 0xf4, 0x22, 0x33, 0x88, 0x7e, 0x65, - 0x86, 0x97, 0x31, 0x0f, 0x02, 0x0b, 0x91, 0x19, 0x5e, 0x4a, 0x0e, 0xf8, 0x4d, 0x5a, 0xb0, 0x24, - 0x76, 0x70, 0xb4, 0xb5, 0xbd, 0x65, 0x23, 0x26, 0xf9, 0x49, 0x03, 0x36, 0xf6, 0xae, 0xd9, 0x4b, - 0x16, 0x99, 0x88, 0xb7, 0x6e, 0x28, 0x23, 0xf4, 0x0a, 0xd6, 0x15, 0x09, 0xa1, 0xef, 0xb9, 0x21, - 0xe3, 0x70, 0x02, 0x16, 0x4e, 0x9c, 0x08, 0x85, 0xd4, 0x0d, 0x49, 0x91, 0x06, 0xd4, 0xc6, 0xe1, - 0x48, 0x62, 0xe4, 0x9f, 0xe4, 0x30, 0x15, 0x5c, 0xdb, 0xad, 0xed, 0xad, 0x1c, 0xb6, 0x9e, 0xfa, - 0xfd, 0xa7, 0x47, 0xde, 0x78, 0xec, 0xb9, 0xb1, 0x16, 0x04, 0xd3, 0x04, 0x12, 0xfd, 0x14, 0xb6, - 0x85, 0x9a, 0x5e, 0xa2, 0x85, 0xdf, 0x49, 0x43, 0xf4, 0x16, 0xf4, 0xb2, 0x4d, 0x73, 0x03, 0x7e, - 0x96, 0x07, 0xbc, 0xc5, 0x01, 0xbf, 0x9a, 0xb0, 0xe0, 0xb6, 0x17, 0x99, 0xd1, 0x24, 0x2c, 0xe2, - 0xfd, 0x2d, 0x90, 0x53, 0x9f, 0x71, 0x4f, 0x52, 0xcd, 0xa0, 0x43, 0xd5, 0xf3, 0x51, 0xdc, 0xda, - 0x21, 0x70, 0x1e, 0x7c, 0xf2, 0xd4, 0x37, 0xaa, 0x9e, 0xcf, 0x4d, 0xe4, 0x72, 0xc7, 0x12, 0x72, - 0xf1, 0x5b, 0x35, 0x51, 0x2d, 0x63, 0x22, 0xfa, 0x67, 0x0d, 0x1e, 0x64, 0x04, 0xc8, 0x43, 0xcd, - 0x92, 0x90, 0x1e, 0xb8, 0x5a, 0x76, 0xe0, 0x5a, 0xa9, 0x85, 0x16, 0xde, 0xd5, 0x42, 0x9f, 0xc3, - 0xba, 0x50, 0xf6, 0x7b, 0xfb, 0x1d, 0x0d, 0x80, 0xa8, 0x2c, 0xee, 0xc4, 0xb1, 0xbe, 0x80, 0xa6, - 0x62, 0xc8, 0xae, 0x1d, 0x46, 0x0a, 0x76, 0x37, 0xbd, 0xe9, 0x05, 0x83, 0xe4, 0xb0, 0x5f, 0xc3, - 0x56, 0x81, 0xcf, 0x5d, 0x38, 0xda, 0x31, 0x6c, 0xe2, 0xfc, 0x71, 0x10, 0x78, 0xc1, 0xfb, 0xc3, - 0x8f, 0xa4, 0x1a, 0x14, 0x36, 0x73, 0xa3, 0xff, 0x59, 0x1e, 0x7d, 0x33, 0x41, 0x8f, 0x6c, 0x8b, - 0xe0, 0x8f, 0xe0, 0x41, 0xef, 0xc2, 0xbb, 0xe9, 0x74, 0xba, 0x5d, 0xcf, 0xba, 0x0c, 0xdf, 0xcf, - 0x6b, 0xfe, 0xa6, 0xc1, 0x92, 0xe4, 0x40, 0xd6, 0xa0, 0x7a, 0xd2, 0x91, 0xfb, 0xaa, 0x27, 0x9d, - 0x84, 0x53, 0x55, 0xe1, 0x44, 0x60, 0x61, 0xec, 0x0d, 0xe2, 0x38, 0x8c, 0xdf, 0x64, 0x03, 0xee, - 0x79, 0x37, 0x2e, 0x0b, 0x5a, 0x0b, 0x38, 0x28, 0x08, 0xbe, 0xb2, 0xd3, 0xe9, 0x86, 0xad, 0x7b, - 0x28, 0x10, 0xbf, 0x31, 0xea, 0xde, 0xba, 0x16, 0x1b, 0xb4, 0x16, 0x71, 0x54, 0x52, 0x44, 0x87, - 0xfa, 0xc4, 0x95, 0x33, 0x4b, 0x38, 0x93, 0xd0, 0xd4, 0x82, 0x8d, 0xec, 0x31, 0xe7, 0x56, 0xed, - 0x87, 0x70, 0xcf, 0xe1, 0x5b, 0xa5, 0x62, 0x57, 0xb8, 0x62, 0x25, 0x3b, 0x43, 0xcc, 0x50, 0x07, - 0x36, 0xce, 0x5d, 0xfe, 0x19, 0x8f, 0x4b, 0x65, 0xe6, 0x55, 0x42, 0xe1, 0x7e, 0xc0, 0x7c, 0xc7, - 0xb4, 0xd8, 0x29, 0x9e, 0x58, 0x48, 0xc9, 0x8c, 0x91, 0x5d, 0x58, 0x19, 0x7a, 0x81, 0xc5, 0x0c, - 0x8c, 0xf9, 0x32, 0x03, 0xa8, 0x43, 0xf4, 0x73, 0xd8, 0xcc, 0x49, 0x9b, 0xf7, 0x4c, 0xf4, 0x39, - 0xb4, 0x7b, 0x37, 0x76, 0x64, 0x5d, 0x28, 0x99, 0x4f, 0x04, 0xea, 0x18, 0xba, 0x62, 0x73, 0x2d, - 0x6b, 0xf3, 0xdf, 0xc3, 0xe3, 0xa9, 0x7b, 0xef, 0x24, 0x6c, 0x18, 0xb0, 0x2d, 0xc3, 0x6f, 0x49, - 0xa5, 0xf0, 0x50, 0x09, 0xc2, 0x68, 0x2a, 0x9c, 0x95, 0x51, 0x78, 0xba, 0x23, 0x7f, 0xaf, 0x81, - 0x5e, 0xc6, 0x54, 0x1e, 0x68, 0x26, 0xd7, 0xff, 0x6f, 0x6c, 0xff, 0x41, 0x83, 0xf5, 0xaf, 0x4c, - 0x77, 0xe0, 0xb0, 0xde, 0xab, 0x6e, 0x38, 0x2b, 0xc2, 0x6c, 0x23, 0xc8, 0x2a, 0x82, 0x5c, 0xe6, - 0x8c, 0x7b, 0xaf, 0xba, 0x69, 0x82, 0x33, 0x83, 0x51, 0x9c, 0xc9, 0xf0, 0x9b, 0xd7, 0x4c, 0xfd, - 0xa4, 0x66, 0x12, 0x77, 0x2f, 0x1d, 0x50, 0x2a, 0x9c, 0x7b, 0x6a, 0x85, 0xc3, 0xeb, 0x93, 0xf0, - 0xca, 0x39, 0x33, 0xa3, 0x88, 0x05, 0x6e, 0x6b, 0x51, 0x54, 0x62, 0xe9, 0x08, 0xbf, 0x8b, 0xe1, - 0x85, 0x19, 0x0c, 0x6c, 0x77, 0xd4, 0x5a, 0x42, 0x75, 0x24, 0x34, 0xcf, 0x31, 0xea, 0x49, 0xee, - 0xc4, 0x59, 0xbe, 0xd7, 0x60, 0xeb, 0x6c, 0x12, 0x8c, 0xca, 0x7c, 0x65, 0xaa, 0x8f, 0xf3, 0x53, - 0xd8, 0xae, 0x69, 0x45, 0xf6, 0x35, 0x93, 0x46, 0x4d, 0x68, 0x8c, 0x6b, 0xf6, 0x58, 0xdc, 0xcc, - 0x9a, 0x81, 0xdf, 0x7c, 0xfd, 0xd0, 0x76, 0x18, 0x9a, 0x44, 0xa8, 0x32, 0xa1, 0x51, 0x93, 0x93, - 0x7e, 0xc7, 0x0e, 0x12, 0x4d, 0x22, 0x45, 0x7f, 0x07, 0xad, 0x22, 0xb0, 0x3b, 0xd1, 0xc9, 0x13, - 0x68, 0x1c, 0x5d, 0x30, 0xeb, 0xf2, 0x7f, 0x54, 0x0b, 0xf4, 0x33, 0x58, 0x57, 0xd6, 0xcd, 0x1d, - 0x64, 0xba, 0xb0, 0x21, 0xaf, 0x54, 0x0f, 0x05, 0xc7, 0xa2, 0x76, 0x94, 0xcb, 0x74, 0x1f, 0xfd, - 0x14, 0xa7, 0xd3, 0xdb, 0x24, 0x0b, 0x4a, 0x71, 0x45, 0xe3, 0x82, 0x72, 0x02, 0x9b, 0x39, 0x6e, - 0x77, 0xa2, 0xab, 0x63, 0xd8, 0x34, 0xd8, 0xc8, 0xe6, 0xe1, 0x2d, 0x5e, 0x32, 0x33, 0xc7, 0x9b, - 0x83, 0x41, 0xc0, 0xc2, 0x50, 0x8a, 0x8d, 0x49, 0xfa, 0x02, 0x9a, 0x79, 0x36, 0x73, 0xeb, 0xf3, - 0x17, 0xb0, 0x71, 0x3a, 0x1c, 0x3a, 0xb6, 0xcb, 0x5e, 0xb2, 0x71, 0x3f, 0x83, 0x24, 0xba, 0xf5, - 0x13, 0x24, 0xfc, 0xbb, 0xac, 0xa2, 0xe5, 0x79, 0x23, 0xb7, 0x7f, 0x6e, 0x08, 0x3f, 0x4f, 0x4c, - 0xda, 0x65, 0xe6, 0x20, 0x85, 0x50, 0x30, 0xa9, 0x98, 0x16, 0x26, 0x45, 0xc1, 0xd9, 0x5d, 0x73, - 0x0b, 0xfe, 0x93, 0x06, 0x20, 0x92, 0xcc, 0x89, 0x3b, 0xf4, 0x4a, 0x95, 0xaf, 0x43, 0x7d, 0x8c, - 0xe7, 0x3a, 0xe9, 0xe0, 0xce, 0x05, 0x23, 0xa1, 0x79, 0x8d, 0x61, 0x3a, 0x76, 0x92, 0x4e, 0x05, - 0xc1, 0x77, 0xf8, 0x8c, 0x05, 0xe7, 0x46, 0x57, 0xc4, 0xe3, 0x65, 0x23, 0xa1, 0x79, 0x9c, 0xb3, - 0x1c, 0x9b, 0xb9, 0x11, 0xce, 0x8a, 0x2a, 0x44, 0x19, 0xa1, 0x7d, 0x00, 0x61, 0xc8, 0xa9, 0x78, - 0x78, 0xcc, 0x1d, 0x0c, 0xe2, 0x24, 0x8f, 0xdf, 0x1c, 0x47, 0x18, 0x99, 0xa3, 0xb8, 0x00, 0x12, - 0x84, 0x12, 0x6b, 0x17, 0x32, 0xdd, 0x64, 0x17, 0x1a, 0xbc, 0x1c, 0x14, 0x4a, 0x13, 0x36, 0x8b, - 0x55, 0xa3, 0xa5, 0x5e, 0x5d, 0xd6, 0xbc, 0xc4, 0xb2, 0x6b, 0xa9, 0x6c, 0xfa, 0xb5, 0xe0, 0x26, - 0xb4, 0x38, 0x95, 0xdb, 0x1e, 0x2c, 0x89, 0x46, 0x5e, 0xa4, 0xc8, 0x95, 0xc3, 0x35, 0x6e, 0xce, - 0x54, 0xf5, 0x46, 0x3c, 0x1d, 0xf3, 0x13, 0x5a, 0x98, 0xc5, 0x4f, 0x3c, 0x02, 0x64, 0xf8, 0xa5, - 0xaa, 0x33, 0xe2, 0x69, 0xfa, 0x77, 0x0d, 0x96, 0x04, 0x9b, 0x90, 0x3c, 0x85, 0x45, 0x07, 0x4f, - 0x8d, 0xac, 0x56, 0x0e, 0x37, 0xd0, 0xa7, 0x72, 0xba, 0xf8, 0xaa, 0x62, 0xc8, 0x55, 0x7c, 0xbd, - 0x80, 0x85, 0x5a, 0x50, 0xd6, 0xab, 0xa7, 0xe5, 0xeb, 0xc5, 0x2a, 0xbe, 0x5e, 0x88, 0x45, 0x0d, - 0x29, 0xeb, 0xd5, 0xd3, 0xf0, 0xf5, 0x62, 0xd5, 0x8b, 0x3a, 0x2c, 0x0a, 0x5f, 0xe2, 0xfd, 0x37, - 0xf2, 0xcd, 0xdc, 0xc0, 0x66, 0x06, 0x6e, 0x3d, 0x81, 0xd5, 0xcc, 0xc0, 0xaa, 0x27, 0xe2, 0x9b, - 0x19, 0xf1, 0xf5, 0x58, 0x0c, 0x77, 0x0f, 0x6e, 0xbe, 0xd8, 0x1b, 0x05, 0x41, 0x19, 0x10, 0x55, - 0xe4, 0xdc, 0x61, 0xef, 0x13, 0x58, 0x12, 0xe0, 0x33, 0x25, 0xac, 0x54, 0xb5, 0x11, 0xcf, 0xd1, - 0x7f, 0x68, 0x69, 0xbc, 0xb6, 0x2e, 0xd8, 0xd8, 0x9c, 0x1e, 0xaf, 0x71, 0x3a, 0x2d, 0x2d, 0x0a, - 0x65, 0xfe, 0xd4, 0xde, 0x99, 0x5f, 0xb9, 0x81, 0x19, 0x99, 0x7d, 0x33, 0x4c, 0x12, 0x65, 0x4c, - 0xf3, 0xd3, 0x47, 0x66, 0xdf, 0x89, 0x2b, 0x0e, 0x41, 0xe0, 0xe5, 0x40, 0x79, 0xb2, 0xd8, 0x90, - 0x94, 0x9a, 0x0f, 0x24, 0xda, 0x3b, 0xc9, 0x07, 0xfb, 0xb0, 0xf1, 0x25, 0x8b, 0x7a, 0x93, 0x3e, - 0x4f, 0x8a, 0x47, 0xc3, 0xd1, 0x8c, 0x74, 0x40, 0xcf, 0x61, 0x33, 0xb7, 0x76, 0x6e, 0x88, 0x04, - 0x16, 0xac, 0x61, 0x5a, 0xb8, 0xf1, 0x6f, 0xfa, 0x13, 0x58, 0xff, 0x92, 0x45, 0xef, 0x20, 0xff, - 0x0c, 0x88, 0xba, 0x70, 0x6e, 0xe1, 0x0d, 0xa8, 0x59, 0xc3, 0xa4, 0x80, 0xb5, 0x86, 0xa3, 0xfd, - 0x3e, 0xd4, 0xe3, 0x64, 0x4d, 0x1e, 0xc0, 0x07, 0x27, 0xee, 0xb5, 0xe9, 0xd8, 0x83, 0x78, 0xa8, - 0x51, 0x21, 0x1f, 0xc0, 0x0a, 0x3e, 0x4f, 0x89, 0xa1, 0x86, 0x46, 0x1a, 0x70, 0x5f, 0xbc, 0x2b, - 0xc8, 0x91, 0x2a, 0x59, 0x03, 0xe8, 0x45, 0x9e, 0x2f, 0xe9, 0x1a, 0xd2, 0x17, 0xde, 0x8d, 0xa4, - 0x17, 0xf6, 0x7f, 0x09, 0xf5, 0x38, 0x7b, 0x28, 0x32, 0xe2, 0xa1, 0x46, 0x85, 0xac, 0xc3, 0xea, - 0xf1, 0xb5, 0x6d, 0x45, 0xc9, 0x90, 0x46, 0xb6, 0xe0, 0xc1, 0x91, 0xe9, 0x5a, 0xcc, 0xc9, 0x4e, - 0x54, 0x0f, 0xff, 0xd8, 0x80, 0x45, 0x11, 0x03, 0xc8, 0x37, 0xb0, 0x9c, 0xbc, 0x9c, 0x11, 0xbc, - 0xf0, 0xf9, 0xa7, 0x3a, 0x7d, 0x33, 0x37, 0x2a, 0x34, 0x46, 0x1f, 0xff, 0xe1, 0x9f, 0xff, 0xf9, - 0x6b, 0x75, 0x9b, 0x6e, 0x1c, 0x98, 0xbe, 0x1d, 0x1e, 0x5c, 0x3f, 0x33, 0x1d, 0xff, 0xc2, 0x7c, - 0x76, 0xc0, 0x7d, 0x3d, 0x7c, 0xae, 0xed, 0x93, 0x21, 0xac, 0x28, 0x0f, 0x42, 0x04, 0x7b, 0xef, - 0xe2, 0x13, 0x94, 0xbe, 0x55, 0x18, 0x97, 0x02, 0x9e, 0xa0, 0x80, 0x5d, 0xfd, 0x61, 0x99, 0x80, - 0x83, 0xd7, 0xdc, 0x98, 0xdf, 0x71, 0x39, 0x9f, 0x01, 0xa4, 0x8f, 0x34, 0x04, 0xd1, 0x16, 0xde, - 0x7d, 0xf4, 0x66, 0x7e, 0x58, 0x0a, 0xa9, 0x10, 0x07, 0x56, 0x94, 0xf7, 0x0c, 0xa2, 0xe7, 0x1e, - 0x38, 0x94, 0x17, 0x0c, 0xfd, 0x61, 0xe9, 0x9c, 0xe4, 0xf4, 0x31, 0xc2, 0x6d, 0x93, 0x9d, 0x1c, - 0xdc, 0x10, 0x97, 0x4a, 0xbc, 0xe4, 0x18, 0x20, 0x7d, 0x7f, 0x20, 0xdb, 0xd9, 0xf7, 0x08, 0x55, - 0x96, 0x5e, 0x36, 0x95, 0x80, 0x3e, 0x82, 0xfb, 0x6a, 0x03, 0x4f, 0x50, 0x89, 0x25, 0x2f, 0x17, - 0x7a, 0xab, 0x38, 0x91, 0x30, 0xf9, 0x02, 0x56, 0x33, 0x2d, 0x33, 0xc1, 0xc5, 0x65, 0x3d, 0xbb, - 0xbe, 0x5d, 0x32, 0x93, 0xf0, 0x39, 0x8f, 0x5f, 0xc9, 0xd4, 0x57, 0x4d, 0xf2, 0x28, 0xd5, 0x78, - 0xc9, 0x13, 0xa9, 0xde, 0x9e, 0x36, 0x9d, 0xb0, 0xfd, 0x06, 0xb6, 0xa6, 0x3c, 0x44, 0x13, 0x9a, - 0x6e, 0x9e, 0xf6, 0x4a, 0xad, 0x4f, 0x0d, 0x5b, 0xb4, 0xc2, 0x5d, 0x26, 0xed, 0xb9, 0x84, 0xcb, - 0x14, 0xba, 0x49, 0xe1, 0x32, 0xc5, 0xd6, 0x8c, 0x56, 0xc8, 0x00, 0xb6, 0xa6, 0x34, 0xfb, 0x02, - 0xd9, 0xec, 0x57, 0x04, 0xfd, 0xa3, 0x99, 0x6b, 0x94, 0xf3, 0x37, 0x8b, 0xcd, 0x37, 0xfa, 0xf8, - 0x23, 0xe5, 0xca, 0x14, 0x3b, 0x38, 0xa1, 0xda, 0xe9, 0x7d, 0x3b, 0xad, 0x90, 0x53, 0x68, 0xe4, - 0xbb, 0x2c, 0x82, 0xce, 0x3d, 0xa5, 0x29, 0xd4, 0x77, 0xca, 0x27, 0x15, 0x86, 0xa4, 0xf8, 0x9f, - 0x42, 0xe0, 0x9c, 0xfa, 0xff, 0x62, 0xa6, 0x85, 0x9e, 0xc3, 0x72, 0xd2, 0x65, 0x89, 0xb8, 0x94, - 0x6f, 0xce, 0x44, 0x5c, 0x2a, 0xb4, 0x62, 0xb4, 0x42, 0x46, 0xb0, 0x9a, 0x69, 0x8a, 0x84, 0x5f, - 0x97, 0x75, 0x5d, 0xc2, 0xaf, 0x4b, 0x3b, 0x28, 0xfa, 0x21, 0xde, 0xe7, 0x87, 0x7a, 0x33, 0x7f, - 0x9f, 0x45, 0xce, 0xe3, 0x91, 0xe7, 0x04, 0xd6, 0xb2, 0xfd, 0x8b, 0xb8, 0xd0, 0xa5, 0xad, 0x91, - 0xb8, 0xd0, 0xe5, 0xed, 0x0e, 0xad, 0x90, 0x00, 0x56, 0x33, 0x6d, 0x88, 0xc4, 0x5c, 0xd2, 0xd9, - 0x48, 0xcc, 0x65, 0x3d, 0x0b, 0xfd, 0x29, 0x62, 0x7e, 0xb2, 0xff, 0x71, 0x0e, 0xb3, 0xac, 0x66, - 0x0e, 0x5e, 0xf3, 0x36, 0xe8, 0xbb, 0x38, 0x16, 0x5d, 0x26, 0x7a, 0x12, 0xb9, 0x21, 0xa3, 0xa7, - 0x4c, 0x2b, 0x93, 0xd1, 0x53, 0xb6, 0x5d, 0xa1, 0x9f, 0xa0, 0xcc, 0xc7, 0xba, 0x9e, 0x93, 0x29, - 0xaa, 0xbd, 0x83, 0xd7, 0x9e, 0x8f, 0x51, 0xfa, 0x37, 0x00, 0x69, 0xbd, 0x26, 0xae, 0x5c, 0xa1, - 0x64, 0x14, 0x57, 0xae, 0x58, 0xd6, 0xd1, 0x36, 0xca, 0x68, 0x91, 0x66, 0xf9, 0xb9, 0xc8, 0x30, - 0xb5, 0x38, 0x96, 0x3d, 0x59, 0x8b, 0xab, 0x75, 0x5b, 0xd6, 0xe2, 0x99, 0x1a, 0x89, 0xee, 0xa2, - 0x14, 0x5d, 0xdf, 0xcc, 0x5b, 0x1c, 0x97, 0xf1, 0x43, 0x38, 0xb0, 0x9a, 0xa9, 0x5d, 0x84, 0x9c, - 0xb2, 0xd2, 0x47, 0xc8, 0x29, 0x2d, 0x74, 0xe2, 0xc4, 0x46, 0xda, 0x79, 0x39, 0x93, 0xbe, 0x9a, - 0xdb, 0xc8, 0xb7, 0x00, 0x69, 0xa5, 0x22, 0x54, 0x56, 0x28, 0x71, 0x84, 0xca, 0x8a, 0x05, 0x0d, - 0xfd, 0x08, 0x85, 0x3c, 0x22, 0xb3, 0xb2, 0xe7, 0x8b, 0xd6, 0x0f, 0x6f, 0xda, 0xda, 0x8f, 0x6f, - 0xda, 0xda, 0xbf, 0xdf, 0xb4, 0xb5, 0xbf, 0xbc, 0x6d, 0x57, 0x7e, 0x7c, 0xdb, 0xae, 0xfc, 0xeb, - 0x6d, 0xbb, 0xd2, 0x5f, 0xc4, 0xff, 0x8f, 0x9f, 0xfe, 0x37, 0x00, 0x00, 0xff, 0xff, 0xfc, 0xbb, - 0xa5, 0xe9, 0xc3, 0x1c, 0x00, 0x00, + // 2034 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xbc, 0x59, 0x4f, 0x6f, 0xe3, 0xd6, + 0x11, 0x17, 0x25, 0xaf, 0x2d, 0x8f, 0xd7, 0x8e, 0xfc, 0xd6, 0x96, 0x65, 0xae, 0x57, 0xeb, 0xbc, + 0x24, 0x5b, 0xc3, 0x28, 0xd6, 0x5d, 0xa7, 0xa7, 0x05, 0x52, 0x20, 0x6b, 0x39, 0x89, 0x51, 0x6d, + 0xec, 0xa5, 0x6a, 0x14, 0x41, 0x81, 0x22, 0x14, 0xf5, 0x24, 0x13, 0xa6, 0x48, 0x9a, 0xa4, 0xec, + 0x1a, 0x8b, 0xa0, 0x40, 0x0f, 0x3d, 0xb6, 0x05, 0x7a, 0xc8, 0xb1, 0x87, 0x5e, 0xfb, 0x41, 0x72, + 0x0c, 0xd0, 0x4b, 0x8f, 0xc5, 0x6e, 0x3f, 0x48, 0xf1, 0xe6, 0x3d, 0x92, 0x8f, 0x7f, 0xa4, 0xae, + 0x16, 0xa8, 0x6f, 0x9c, 0xf7, 0x67, 0xe6, 0xf7, 0x66, 0xe6, 0xcd, 0x9b, 0x19, 0xc2, 0xda, 0x60, + 0x3c, 0x36, 0xc3, 0x88, 0x05, 0x4f, 0xfd, 0xc0, 0x8b, 0x3c, 0x52, 0xf5, 0xfb, 0xfa, 0xda, 0x60, + 0x7c, 0xe3, 0x05, 0x97, 0xf1, 0x98, 0xbe, 0x33, 0xf2, 0xbc, 0x91, 0xc3, 0x0e, 0x4c, 0xdf, 0x3e, + 0x30, 0x5d, 0xd7, 0x8b, 0xcc, 0xc8, 0xf6, 0xdc, 0x50, 0xcc, 0xd2, 0x2b, 0xd8, 0x7e, 0x69, 0x8f, + 0x02, 0x33, 0x62, 0xbf, 0xc6, 0x4d, 0x06, 0x73, 0xcc, 0x5b, 0x83, 0x5d, 0x4d, 0x58, 0x18, 0x91, + 0x36, 0xc0, 0x0b, 0xdb, 0x75, 0xbc, 0xd1, 0xd7, 0xe6, 0x98, 0xb5, 0xb4, 0x5d, 0x6d, 0x6f, 0xd9, + 0x50, 0x46, 0xc8, 0x0e, 0x2c, 0x0b, 0xea, 0xcc, 0x0b, 0x5b, 0xd5, 0x5d, 0x6d, 0x6f, 0xd5, 0x48, + 0x07, 0x48, 0x13, 0x16, 0x43, 0x6f, 0x12, 0x58, 0xac, 0x55, 0xc3, 0x9d, 0x92, 0xa2, 0x67, 0xd0, + 0x3e, 0xf7, 0x07, 0x59, 0x89, 0x47, 0x9e, 0x3b, 0xb4, 0x47, 0xb1, 0xdc, 0x26, 0x2c, 0x5a, 0x38, + 0x20, 0x65, 0x4a, 0x4a, 0xe1, 0x58, 0xcd, 0x70, 0xfc, 0x16, 0x1a, 0xbd, 0xc8, 0x0c, 0xa2, 0x5f, + 0x99, 0xe1, 0x65, 0xcc, 0x83, 0xc0, 0x42, 0x64, 0x86, 0x97, 0x92, 0x03, 0x7e, 0x93, 0x16, 0x2c, + 0x89, 0x1d, 0x1c, 0x6d, 0x6d, 0x6f, 0xd9, 0x88, 0x49, 0x7e, 0xd2, 0x80, 0x8d, 0xbd, 0x6b, 0xf6, + 0x92, 0x45, 0x26, 0xe2, 0xad, 0x1b, 0xca, 0x08, 0xbd, 0x82, 0x75, 0x45, 0x42, 0xe8, 0x7b, 0x6e, + 0xc8, 0x38, 0x9c, 0x80, 0x85, 0x13, 0x27, 0x42, 0x21, 0x75, 0x43, 0x52, 0xa4, 0x01, 0xb5, 0x71, + 0x38, 0x92, 0x18, 0xf9, 0x27, 0x39, 0x4c, 0x05, 0xd7, 0x76, 0x6b, 0x7b, 0x2b, 0x87, 0xad, 0xa7, + 0x7e, 0xff, 0xe9, 0x91, 0x37, 0x1e, 0x7b, 0x6e, 0xac, 0x05, 0xc1, 0x34, 0x81, 0x44, 0x3f, 0x85, + 0x6d, 0xa1, 0xa6, 0x97, 0x68, 0xe1, 0x77, 0xd2, 0x10, 0xbd, 0x05, 0xbd, 0x6c, 0xd3, 0xdc, 0x80, + 0x9f, 0xe5, 0x01, 0x6f, 0x71, 0xc0, 0xaf, 0x26, 0x2c, 0xb8, 0xed, 0x45, 0x66, 0x34, 0x09, 0x8b, + 0x78, 0x7f, 0x0b, 0xe4, 0xd4, 0x67, 0xdc, 0x93, 0x54, 0x33, 0xe8, 0x50, 0xf5, 0x7c, 0x14, 0xb7, + 0x76, 0x08, 0x9c, 0x07, 0x9f, 0x3c, 0xf5, 0x8d, 0xaa, 0xe7, 0x73, 0x13, 0xb9, 0xdc, 0xb1, 0x84, + 0x5c, 0xfc, 0x56, 0x4d, 0x54, 0xcb, 0x98, 0x88, 0xfe, 0x59, 0x83, 0x07, 0x19, 0x01, 0xf2, 0x50, + 0xb3, 0x24, 0xa4, 0x07, 0xae, 0x96, 0x1d, 0xb8, 0x56, 0x6a, 0xa1, 0x85, 0x77, 0xb5, 0xd0, 0xe7, + 0xb0, 0x2e, 0x94, 0xfd, 0xde, 0x7e, 0x47, 0x03, 0x20, 0x2a, 0x8b, 0x3b, 0x71, 0xac, 0x2f, 0xa0, + 0xa9, 0x18, 0xb2, 0x6b, 0x87, 0x91, 0x82, 0xdd, 0x4d, 0x6f, 0x7a, 0xc1, 0x20, 0x39, 0xec, 0xd7, + 0xb0, 0x55, 0xe0, 0x73, 0x17, 0x8e, 0x76, 0x0c, 0x9b, 0x38, 0x7f, 0x1c, 0x04, 0x5e, 0xf0, 0xfe, + 0xf0, 0x23, 0xa9, 0x06, 0x85, 0xcd, 0xdc, 0xe8, 0x7f, 0x96, 0x47, 0xdf, 0x4c, 0xd0, 0x23, 0xdb, + 0x22, 0xf8, 0x23, 0x78, 0xd0, 0xbb, 0xf0, 0x6e, 0x3a, 0x9d, 0x6e, 0xd7, 0xb3, 0x2e, 0xc3, 0xf7, + 0xf3, 0x9a, 0xbf, 0x69, 0xb0, 0x24, 0x39, 0x90, 0x35, 0xa8, 0x9e, 0x74, 0xe4, 0xbe, 0xea, 0x49, + 0x27, 0xe1, 0x54, 0x55, 0x38, 0x11, 0x58, 0x18, 0x7b, 0x83, 0x38, 0x0e, 0xe3, 0x37, 0xd9, 0x80, + 0x7b, 0xde, 0x8d, 0xcb, 0x82, 0xd6, 0x02, 0x0e, 0x0a, 0x82, 0xaf, 0xec, 0x74, 0xba, 0x61, 0xeb, + 0x1e, 0x0a, 0xc4, 0x6f, 0x8c, 0xba, 0xb7, 0xae, 0xc5, 0x06, 0xad, 0x45, 0x1c, 0x95, 0x14, 0xd1, + 0xa1, 0x3e, 0x71, 0xe5, 0xcc, 0x12, 0xce, 0x24, 0x34, 0xb5, 0x60, 0x23, 0x7b, 0xcc, 0xb9, 0x55, + 0xfb, 0x21, 0xdc, 0x73, 0xf8, 0x56, 0xa9, 0xd8, 0x15, 0xae, 0x58, 0xc9, 0xce, 0x10, 0x33, 0xd4, + 0x81, 0x8d, 0x73, 0x97, 0x7f, 0xc6, 0xe3, 0x52, 0x99, 0x79, 0x95, 0x50, 0xb8, 0x1f, 0x30, 0xdf, + 0x31, 0x2d, 0x76, 0x8a, 0x27, 0x16, 0x52, 0x32, 0x63, 0x64, 0x17, 0x56, 0x86, 0x5e, 0x60, 0x31, + 0x03, 0x63, 0xbe, 0x7c, 0x01, 0xd4, 0x21, 0xfa, 0x39, 0x6c, 0xe6, 0xa4, 0xcd, 0x7b, 0x26, 0xfa, + 0x1c, 0xda, 0xbd, 0x1b, 0x3b, 0xb2, 0x2e, 0x94, 0x97, 0x4f, 0x04, 0xea, 0x18, 0xba, 0x62, 0x73, + 0x2d, 0x6b, 0xf3, 0xdf, 0xc3, 0xe3, 0xa9, 0x7b, 0xef, 0x24, 0x6c, 0x18, 0xb0, 0x2d, 0xc3, 0x6f, + 0x49, 0xa6, 0xf0, 0x50, 0x09, 0xc2, 0x68, 0x2a, 0x9c, 0x95, 0x51, 0x78, 0xba, 0x23, 0x7f, 0xaf, + 0x81, 0x5e, 0xc6, 0x54, 0x1e, 0x68, 0x26, 0xd7, 0xff, 0x6f, 0x6c, 0xff, 0x41, 0x83, 0xf5, 0xaf, + 0x4c, 0x77, 0xe0, 0xb0, 0xde, 0xab, 0x6e, 0x38, 0x2b, 0xc2, 0x6c, 0x23, 0xc8, 0x2a, 0x82, 0x5c, + 0xe6, 0x8c, 0x7b, 0xaf, 0xba, 0xe9, 0x03, 0x67, 0x06, 0xa3, 0xf8, 0x25, 0xc3, 0x6f, 0x9e, 0x33, + 0xf5, 0x93, 0x9c, 0x49, 0xdc, 0xbd, 0x74, 0x40, 0xc9, 0x70, 0xee, 0xa9, 0x19, 0x0e, 0xcf, 0x4f, + 0xc2, 0x2b, 0xe7, 0xcc, 0x8c, 0x22, 0x16, 0xb8, 0xad, 0x45, 0x91, 0x89, 0xa5, 0x23, 0xfc, 0x2e, + 0x86, 0x17, 0x66, 0x30, 0xb0, 0xdd, 0x51, 0x6b, 0x09, 0xd5, 0x91, 0xd0, 0xfc, 0x8d, 0x51, 0x4f, + 0x72, 0x27, 0xce, 0xf2, 0xbd, 0x06, 0x5b, 0x67, 0x93, 0x60, 0x54, 0xe6, 0x2b, 0x53, 0x7d, 0x9c, + 0x9f, 0xc2, 0x76, 0x4d, 0x2b, 0xb2, 0xaf, 0x99, 0x34, 0x6a, 0x42, 0x63, 0x5c, 0xb3, 0xc7, 0xe2, + 0x66, 0xd6, 0x0c, 0xfc, 0xe6, 0xeb, 0x87, 0xb6, 0xc3, 0xd0, 0x24, 0x42, 0x95, 0x09, 0x8d, 0x9a, + 0x9c, 0xf4, 0x3b, 0x76, 0x90, 0x68, 0x12, 0x29, 0xfa, 0x3b, 0x68, 0x15, 0x81, 0xdd, 0x89, 0x4e, + 0x9e, 0x40, 0xe3, 0xe8, 0x82, 0x59, 0x97, 0xff, 0x23, 0x5b, 0xa0, 0x9f, 0xc1, 0xba, 0xb2, 0x6e, + 0xee, 0x20, 0x73, 0x01, 0x1b, 0xf2, 0x4a, 0xf5, 0x50, 0x70, 0x2c, 0x6a, 0x47, 0xb9, 0x4c, 0xf7, + 0xd1, 0x4f, 0x71, 0x3a, 0xbd, 0x4d, 0x32, 0xa1, 0x14, 0x57, 0x34, 0x4e, 0xb9, 0xb9, 0x63, 0xe1, + 0xba, 0x93, 0x8e, 0x74, 0xe3, 0x84, 0xa6, 0x13, 0xd8, 0xcc, 0x49, 0xba, 0x13, 0x3d, 0x1e, 0xc3, + 0xa6, 0xc1, 0x46, 0x36, 0x0f, 0x7d, 0xf1, 0x92, 0x99, 0xef, 0xbf, 0x39, 0x18, 0x04, 0x2c, 0x0c, + 0xa5, 0xd8, 0x98, 0xa4, 0x2f, 0xa0, 0x99, 0x67, 0x33, 0xb7, 0xae, 0x7f, 0x01, 0x1b, 0xa7, 0xc3, + 0xa1, 0x63, 0xbb, 0xec, 0x25, 0x1b, 0xf7, 0x33, 0x48, 0xa2, 0x5b, 0x3f, 0x41, 0xc2, 0xbf, 0xcb, + 0xb2, 0x5d, 0xfe, 0xa6, 0xe4, 0xf6, 0xcf, 0x0d, 0xe1, 0xe7, 0x89, 0xb9, 0xbb, 0xcc, 0x1c, 0xa4, + 0x10, 0x0a, 0xe6, 0x16, 0xd3, 0xc2, 0xdc, 0x28, 0x38, 0xbb, 0x6b, 0x6e, 0xc1, 0x7f, 0xd2, 0x00, + 0xc4, 0x03, 0x74, 0xe2, 0x0e, 0xbd, 0x52, 0xe5, 0xeb, 0x50, 0x1f, 0xe3, 0xb9, 0x4e, 0x3a, 0xb8, + 0x73, 0xc1, 0x48, 0x68, 0x9e, 0x7f, 0x98, 0x8e, 0x9d, 0x3c, 0xb5, 0x82, 0xe0, 0x3b, 0x7c, 0xc6, + 0x82, 0x73, 0xa3, 0x2b, 0x62, 0xf5, 0xb2, 0x91, 0xd0, 0x3c, 0x06, 0x5a, 0x8e, 0xcd, 0xdc, 0x08, + 0x67, 0x45, 0x86, 0xa2, 0x8c, 0xd0, 0x3e, 0x80, 0x30, 0xe4, 0x54, 0x3c, 0x3c, 0x1e, 0x0f, 0x06, + 0x71, 0x02, 0x80, 0xdf, 0x1c, 0x47, 0x18, 0x99, 0xa3, 0x38, 0x39, 0x12, 0x84, 0x12, 0x87, 0x17, + 0x32, 0x95, 0x66, 0x17, 0x1a, 0x3c, 0x55, 0x14, 0x4a, 0x13, 0x36, 0x8b, 0x55, 0xa3, 0xa5, 0x5e, + 0x5d, 0x56, 0xd8, 0xc4, 0xb2, 0x6b, 0xa9, 0x6c, 0xfa, 0xb5, 0xe0, 0x26, 0xb4, 0x38, 0x95, 0xdb, + 0x1e, 0x2c, 0x89, 0x22, 0x5f, 0x3c, 0x9f, 0x2b, 0x87, 0x6b, 0xdc, 0x9c, 0xa9, 0xea, 0x8d, 0x78, + 0x3a, 0xe6, 0x27, 0xb4, 0x30, 0x8b, 0x9f, 0x68, 0x10, 0x64, 0xf8, 0xa5, 0xaa, 0x33, 0xe2, 0x69, + 0xfa, 0x77, 0x0d, 0x96, 0x04, 0x9b, 0x90, 0x3c, 0x85, 0x45, 0x07, 0x4f, 0x8d, 0xac, 0x56, 0x0e, + 0x37, 0xd0, 0xa7, 0x72, 0xba, 0xf8, 0xaa, 0x62, 0xc8, 0x55, 0x7c, 0xbd, 0x80, 0x85, 0x5a, 0x50, + 0xd6, 0xab, 0xa7, 0xe5, 0xeb, 0xc5, 0x2a, 0xbe, 0x5e, 0x88, 0x45, 0x0d, 0x29, 0xeb, 0xd5, 0xd3, + 0xf0, 0xf5, 0x62, 0xd5, 0x8b, 0x3a, 0x2c, 0x0a, 0x5f, 0xe2, 0xb5, 0x39, 0xf2, 0xcd, 0xdc, 0xc0, + 0x66, 0x06, 0x6e, 0x3d, 0x81, 0xd5, 0xcc, 0xc0, 0xaa, 0x27, 0xe2, 0x9b, 0x19, 0xf1, 0xf5, 0x58, + 0x0c, 0x77, 0x0f, 0x6e, 0xbe, 0xd8, 0x1b, 0x05, 0x41, 0x19, 0x10, 0x55, 0xe4, 0xdc, 0x61, 0xef, + 0x13, 0x58, 0x12, 0xe0, 0x33, 0xe9, 0xad, 0x54, 0xb5, 0x11, 0xcf, 0xd1, 0x7f, 0x68, 0x69, 0x2c, + 0xb7, 0x2e, 0xd8, 0xd8, 0x9c, 0x1e, 0xcb, 0x71, 0x3a, 0x4d, 0x3b, 0x0a, 0x25, 0xc0, 0xd4, 0xba, + 0x9a, 0x5f, 0xb9, 0x81, 0x19, 0x99, 0x7d, 0x33, 0x4c, 0x1e, 0xd1, 0x98, 0xe6, 0xa7, 0x8f, 0xcc, + 0xbe, 0x13, 0x67, 0x23, 0x82, 0xc0, 0xcb, 0x81, 0xf2, 0x64, 0x22, 0x22, 0x29, 0xf5, 0x3d, 0x90, + 0x68, 0xef, 0xe4, 0x3d, 0xd8, 0x87, 0x8d, 0x2f, 0x59, 0xd4, 0x9b, 0xf4, 0xf9, 0x83, 0x79, 0x34, + 0x1c, 0xcd, 0x78, 0x0e, 0xe8, 0x39, 0x6c, 0xe6, 0xd6, 0xce, 0x0d, 0x91, 0xc0, 0x82, 0x35, 0x4c, + 0x93, 0x3a, 0xfe, 0x4d, 0x7f, 0x02, 0xeb, 0x5f, 0xb2, 0xe8, 0x1d, 0xe4, 0x9f, 0x01, 0x51, 0x17, + 0xce, 0x2d, 0xbc, 0x01, 0x35, 0x6b, 0x98, 0x24, 0xb7, 0xd6, 0x70, 0xb4, 0xdf, 0x87, 0x7a, 0xfc, + 0x90, 0x93, 0x07, 0xf0, 0xc1, 0x89, 0x7b, 0x6d, 0x3a, 0xf6, 0x20, 0x1e, 0x6a, 0x54, 0xc8, 0x07, + 0xb0, 0x82, 0xad, 0x2b, 0x31, 0xd4, 0xd0, 0x48, 0x03, 0xee, 0x8b, 0x9e, 0x83, 0x1c, 0xa9, 0x92, + 0x35, 0x80, 0x5e, 0xe4, 0xf9, 0x92, 0xae, 0x21, 0x7d, 0xe1, 0xdd, 0x48, 0x7a, 0x61, 0xff, 0x97, + 0x50, 0x8f, 0x5f, 0x0f, 0x45, 0x46, 0x3c, 0xd4, 0xa8, 0x90, 0x75, 0x58, 0x3d, 0xbe, 0xb6, 0xad, + 0x28, 0x19, 0xd2, 0xc8, 0x16, 0x3c, 0x38, 0x32, 0x5d, 0x8b, 0x39, 0xd9, 0x89, 0xea, 0xe1, 0x1f, + 0x1b, 0xb0, 0x28, 0x62, 0x00, 0xf9, 0x06, 0x96, 0x93, 0xae, 0x1a, 0xc1, 0x0b, 0x9f, 0x6f, 0xe3, + 0xe9, 0x9b, 0xb9, 0x51, 0xa1, 0x31, 0xfa, 0xf8, 0x0f, 0xff, 0xfc, 0xcf, 0x5f, 0xab, 0xdb, 0x74, + 0xe3, 0xc0, 0xf4, 0xed, 0xf0, 0xe0, 0xfa, 0x99, 0xe9, 0xf8, 0x17, 0xe6, 0xb3, 0x03, 0xee, 0xeb, + 0xe1, 0x73, 0x6d, 0x9f, 0x0c, 0x61, 0x45, 0x69, 0x16, 0x11, 0xac, 0xcb, 0x8b, 0xed, 0x29, 0x7d, + 0xab, 0x30, 0x2e, 0x05, 0x3c, 0x41, 0x01, 0xbb, 0xfa, 0xc3, 0x32, 0x01, 0x07, 0xaf, 0xb9, 0x31, + 0xbf, 0xe3, 0x72, 0x3e, 0x03, 0x48, 0x1b, 0x38, 0x04, 0xd1, 0x16, 0x7a, 0x42, 0x7a, 0x33, 0x3f, + 0x2c, 0x85, 0x54, 0x88, 0x03, 0x2b, 0x4a, 0xaf, 0x83, 0xe8, 0xb9, 0xe6, 0x87, 0xd2, 0xdd, 0xd0, + 0x1f, 0x96, 0xce, 0x49, 0x4e, 0x1f, 0x23, 0xdc, 0x36, 0xd9, 0xc9, 0xc1, 0x0d, 0x71, 0xa9, 0xc4, + 0x4b, 0x8e, 0x01, 0xd2, 0xde, 0x04, 0xd9, 0xce, 0xf6, 0x2a, 0x54, 0x59, 0x7a, 0xd9, 0x54, 0x02, + 0xfa, 0x08, 0xee, 0xab, 0xc5, 0x3d, 0x41, 0x25, 0x96, 0x74, 0x35, 0xf4, 0x56, 0x71, 0x22, 0x61, + 0xf2, 0x05, 0xac, 0x66, 0xca, 0x69, 0x82, 0x8b, 0xcb, 0xea, 0x79, 0x7d, 0xbb, 0x64, 0x26, 0xe1, + 0x73, 0x1e, 0x77, 0xd0, 0xd4, 0x8e, 0x27, 0x79, 0x94, 0x6a, 0xbc, 0xa4, 0x7d, 0xaa, 0xb7, 0xa7, + 0x4d, 0x27, 0x6c, 0xbf, 0x81, 0xad, 0x29, 0x4d, 0x6a, 0x42, 0xd3, 0xcd, 0xd3, 0x3a, 0xd8, 0xfa, + 0xd4, 0xb0, 0x45, 0x2b, 0xdc, 0x65, 0xd2, 0x7a, 0x4c, 0xb8, 0x4c, 0xa1, 0xd2, 0x14, 0x2e, 0x53, + 0x2c, 0xdb, 0x68, 0x85, 0x0c, 0x60, 0x6b, 0x4a, 0x23, 0x40, 0x20, 0x9b, 0xdd, 0x61, 0xd0, 0x3f, + 0x9a, 0xb9, 0x46, 0x39, 0x7f, 0xb3, 0x58, 0x98, 0xa3, 0x8f, 0x3f, 0x52, 0xae, 0x4c, 0xb1, 0xba, + 0x13, 0xaa, 0x9d, 0x5e, 0xd3, 0xd3, 0x0a, 0x39, 0x85, 0x46, 0xbe, 0x02, 0x23, 0xe8, 0xdc, 0x53, + 0x0a, 0x46, 0x7d, 0xa7, 0x7c, 0x52, 0x61, 0x48, 0x8a, 0xff, 0x30, 0x04, 0xce, 0xa9, 0xff, 0x36, + 0x66, 0x5a, 0xe8, 0x39, 0x2c, 0x27, 0x15, 0x98, 0x88, 0x4b, 0xf9, 0xc2, 0x4d, 0xc4, 0xa5, 0x42, + 0x99, 0x46, 0x2b, 0x64, 0x04, 0xab, 0x99, 0xa2, 0x48, 0xf8, 0x75, 0x59, 0x45, 0x26, 0xfc, 0xba, + 0xb4, 0x82, 0xa2, 0x1f, 0xe2, 0x7d, 0x7e, 0xa8, 0x37, 0xf3, 0xf7, 0x59, 0xbc, 0x79, 0x3c, 0xf2, + 0x9c, 0xc0, 0x5a, 0xb6, 0x7e, 0x11, 0x17, 0xba, 0xb4, 0x34, 0x12, 0x17, 0xba, 0xbc, 0xdc, 0xa1, + 0x15, 0x12, 0xc0, 0x6a, 0xa6, 0x0c, 0x91, 0x98, 0x4b, 0x2a, 0x1b, 0x89, 0xb9, 0xac, 0x66, 0xa1, + 0x3f, 0x45, 0xcc, 0x4f, 0xf6, 0x3f, 0xce, 0x61, 0x96, 0xd9, 0xcc, 0xc1, 0x6b, 0x5e, 0x06, 0x7d, + 0x17, 0xc7, 0xa2, 0xcb, 0x44, 0x4f, 0xe2, 0x6d, 0xc8, 0xe8, 0x29, 0x53, 0xca, 0x64, 0xf4, 0x94, + 0x2d, 0x57, 0xe8, 0x27, 0x28, 0xf3, 0xb1, 0xae, 0xe7, 0x64, 0x8a, 0x6c, 0xef, 0xe0, 0xb5, 0xe7, + 0x63, 0x94, 0xfe, 0x0d, 0x40, 0x9a, 0xaf, 0x89, 0x2b, 0x57, 0x48, 0x19, 0xc5, 0x95, 0x2b, 0xa6, + 0x75, 0xb4, 0x8d, 0x32, 0x5a, 0xa4, 0x59, 0x7e, 0x2e, 0x32, 0x4c, 0x2d, 0x8e, 0x69, 0x4f, 0xd6, + 0xe2, 0x6a, 0xde, 0x96, 0xb5, 0x78, 0x26, 0x47, 0xa2, 0xbb, 0x28, 0x45, 0xd7, 0x37, 0xf3, 0x16, + 0xc7, 0x65, 0xfc, 0x10, 0x0e, 0xac, 0x66, 0x72, 0x17, 0x21, 0xa7, 0x2c, 0xf5, 0x11, 0x72, 0x4a, + 0x13, 0x9d, 0xf8, 0x61, 0x23, 0xed, 0xbc, 0x9c, 0x49, 0x5f, 0x7d, 0xdb, 0xc8, 0xb7, 0x00, 0x69, + 0xa6, 0x22, 0x54, 0x56, 0x48, 0x71, 0x84, 0xca, 0x8a, 0x09, 0x0d, 0xfd, 0x08, 0x85, 0x3c, 0x22, + 0xb3, 0x5e, 0xcf, 0x17, 0xad, 0x1f, 0xde, 0xb4, 0xb5, 0x1f, 0xdf, 0xb4, 0xb5, 0x7f, 0xbf, 0x69, + 0x6b, 0x7f, 0x79, 0xdb, 0xae, 0xfc, 0xf8, 0xb6, 0x5d, 0xf9, 0xd7, 0xdb, 0x76, 0xa5, 0xbf, 0x88, + 0xff, 0x26, 0x3f, 0xfd, 0x6f, 0x00, 0x00, 0x00, 0xff, 0xff, 0x0a, 0x5b, 0x35, 0x00, 0xdf, 0x1c, + 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -5663,6 +5672,15 @@ func (m *OperateSourceRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if len(m.SourceID) > 0 { + for iNdEx := len(m.SourceID) - 1; iNdEx >= 0; iNdEx-- { + i -= len(m.SourceID[iNdEx]) + copy(dAtA[i:], m.SourceID[iNdEx]) + i = encodeVarintDmmaster(dAtA, i, uint64(len(m.SourceID[iNdEx]))) + i-- + dAtA[i] = 0x1a + } + } if len(m.Config) > 0 { for iNdEx := len(m.Config) - 1; iNdEx >= 0; iNdEx-- { i -= len(m.Config[iNdEx]) @@ -7339,6 +7357,12 @@ func (m *OperateSourceRequest) Size() (n int) { n += 1 + l + sovDmmaster(uint64(l)) } } + if len(m.SourceID) > 0 { + for _, s := range m.SourceID { + l = len(s) + n += 1 + l + sovDmmaster(uint64(l)) + } + } return n } @@ -11861,6 +11885,38 @@ func (m *OperateSourceRequest) Unmarshal(dAtA []byte) error { } m.Config = append(m.Config, string(dAtA[iNdEx:postIndex])) iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SourceID", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowDmmaster + } + 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 ErrInvalidLengthDmmaster + } + postIndex := iNdEx + intStringLen + if postIndex < 0 { + return ErrInvalidLengthDmmaster + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.SourceID = append(m.SourceID, string(dAtA[iNdEx:postIndex])) + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipDmmaster(dAtA[iNdEx:]) diff --git a/dm/proto/dmmaster.proto b/dm/proto/dmmaster.proto index 5862f7360c..dd49619515 100644 --- a/dm/proto/dmmaster.proto +++ b/dm/proto/dmmaster.proto @@ -327,6 +327,7 @@ enum SourceOp { message OperateSourceRequest { SourceOp op = 1; repeated string config = 2; + repeated string sourceID = 3; } message OperateSourceResponse { diff --git a/tests/dmctl_basic/check_list/operate_source.sh b/tests/dmctl_basic/check_list/operate_source.sh index 31a4f4f1c1..8c0e58c126 100644 --- a/tests/dmctl_basic/check_list/operate_source.sh +++ b/tests/dmctl_basic/check_list/operate_source.sh @@ -19,3 +19,10 @@ function operate_source_stop_not_created_config() { "source config with ID mysql-replica-01 not exists" 1 } +function operate_source_invalid_op() { + source_conf=$1 + run_dm_ctl $WORK_DIR "127.0.0.1:$MASTER_PORT" \ + "operate-source invalid $source_conf" \ + "invalid operate" 1 +} + diff --git a/tests/dmctl_basic/run.sh b/tests/dmctl_basic/run.sh index 0ccd4ac0c0..88c3f45e1a 100755 --- a/tests/dmctl_basic/run.sh +++ b/tests/dmctl_basic/run.sh @@ -65,6 +65,8 @@ function usage_and_arg_test() { echo "operate_source_empty_arg" operate_source_empty_arg operate_source_wrong_config_file + operate_source_invalid_op $MYSQL1_CONF + operate_source_stop_not_created_config $MYSQL1_CONF } function recover_max_binlog_size() { @@ -117,12 +119,12 @@ function run() { sed -i "/relay-binlog-name/i\relay-dir: $WORK_DIR/worker1/relay_log" $WORK_DIR/source1.yaml sed -i "/relay-binlog-name/i\relay-dir: $WORK_DIR/worker2/relay_log" $WORK_DIR/source2.yaml - # operate with invalid op type - run_dm_ctl $WORK_DIR "127.0.0.1:$MASTER_PORT" \ - "operate-source invalid $WORK_DIR/source1.yaml" \ - "invalid operate" 1 + dmctl_operate_source create $WORK_DIR/source1.yaml $SOURCE_ID1 + dmctl_operate_source create $WORK_DIR/source2.yaml $SOURCE_ID2 - operate_source_stop_not_created_config $MYSQL1_CONF + run_dm_ctl $WORK_DIR "127.0.0.1:$MASTER_PORT" \ + "operate-source stop $cur/conf/source1.yaml $SOURCE_ID2" \ + "\"result\": true" 3 dmctl_operate_source create $WORK_DIR/source1.yaml $SOURCE_ID1 dmctl_operate_source create $WORK_DIR/source2.yaml $SOURCE_ID2