From 865578c57c554d8ed5a9f2b88c048bf03235625d Mon Sep 17 00:00:00 2001 From: Gyu-Ho Lee Date: Wed, 17 May 2017 09:22:54 -0700 Subject: [PATCH] *: add Consul v0.8.3, Zookeeper r3.5.3-beta Signed-off-by: Gyu-Ho Lee --- agent/agent_consul.go | 22 ++ agent/agent_zookeeper.go | 56 ++- dbtesterpb/config_analyze_machine.pb.go | 5 +- dbtesterpb/config_client_machine.pb.go | 352 ++++++++++------- dbtesterpb/config_client_machine.proto | 2 + dbtesterpb/database_id.pb.go | 44 ++- dbtesterpb/database_id.proto | 2 + dbtesterpb/flag_cetcd.pb.go | 3 +- dbtesterpb/flag_consul.pb.go | 95 ++++- dbtesterpb/flag_consul.proto | 4 + dbtesterpb/flag_etcd.pb.go | 3 +- dbtesterpb/flag_zetcd.pb.go | 3 +- dbtesterpb/flag_zookeeper.pb.go | 479 ++++++++++++++++++++++-- dbtesterpb/flag_zookeeper.proto | 32 ++ dbtesterpb/message.pb.go | 218 ++++++++--- dbtesterpb/message.proto | 4 +- 16 files changed, 1069 insertions(+), 255 deletions(-) diff --git a/agent/agent_consul.go b/agent/agent_consul.go index 297035da..dda1a5a1 100644 --- a/agent/agent_consul.go +++ b/agent/agent_consul.go @@ -81,6 +81,28 @@ func startConsul(fs *flags, t *transporterServer) error { } } + case dbtesterpb.DatabaseID_consul__v0_8_3: + switch t.req.IPIndex { + case 0: // leader + flags = []string{ + "agent", + "-server", + "-data-dir", fs.consulDataDir, + "-bind", peerIPs[t.req.IPIndex], + "-client", peerIPs[t.req.IPIndex], + "-bootstrap-expect", fmt.Sprintf("%d", len(peerIPs)), + } + default: + flags = []string{ + "agent", + "-server", + "-data-dir", fs.consulDataDir, + "-bind", peerIPs[t.req.IPIndex], + "-client", peerIPs[t.req.IPIndex], + "-join", peerIPs[0], + } + } + default: return fmt.Errorf("database ID %q is not supported", t.req.DatabaseID) } diff --git a/agent/agent_zookeeper.go b/agent/agent_zookeeper.go index dc1109ac..ce66b817 100644 --- a/agent/agent_zookeeper.go +++ b/agent/agent_zookeeper.go @@ -69,18 +69,17 @@ func init() { // Java class paths for Zookeeper. // '-cp' is for 'class search path of directories and zip/jar files'. // See https://zookeeper.apache.org/doc/trunk/zookeeperAdmin.html for more. +// UPDATE FOR EACH ZOOKEEPER RELEASES! +// Search correct paths with 'find ./zookeeper/lib | sort'. const ( // JavaClassPathZookeeperr349 is the Java class paths of Zookeeper r3.4.9. - // CHANGE THIS FOR DIFFERENT ZOOKEEPER RELEASE! - // THIS IS ONLY VALID FOR Zookeeper r3.4.9. - // Search correct paths with 'find ./zookeeper/lib | sort'. JavaClassPathZookeeperr349 = `-cp zookeeper-3.4.9.jar:lib/slf4j-api-1.6.1.jar:lib/slf4j-log4j12-1.6.1.jar:lib/log4j-1.2.16.jar:conf org.apache.zookeeper.server.quorum.QuorumPeerMain` // JavaClassPathZookeeperr352alpha is the Java class paths of Zookeeper r3.5.2-alpha. - // CHANGE THIS FOR DIFFERENT ZOOKEEPER RELEASE! - // THIS IS ONLY VALID FOR Zookeeper r3.5.2-alpha. - // Search correct paths with 'find ./zookeeper/lib | sort'. JavaClassPathZookeeperr352alpha = `-cp zookeeper-3.5.2-alpha.jar:lib/slf4j-api-1.7.5.jar:lib/slf4j-log4j12-1.7.5.jar:lib/log4j-1.2.17.jar:conf org.apache.zookeeper.server.quorum.QuorumPeerMain` + + // JavaClassPathZookeeperr353beta is the Java class paths of Zookeeper r3.5.3-beta. + JavaClassPathZookeeperr353beta = `-cp zookeeper-3.5.3-beta.jar:lib/slf4j-api-1.7.5.jar:lib/slf4j-log4j12-1.7.5.jar:lib/log4j-1.2.17.jar:conf org.apache.zookeeper.server.quorum.QuorumPeerMain` ) // startZookeeper starts Zookeeper. @@ -88,7 +87,6 @@ func startZookeeper(fs *flags, t *transporterServer) error { if !exist(fs.javaExec) { return fmt.Errorf("Java binary %q does not exist", globalFlags.javaExec) } - if err := os.RemoveAll(fs.zkDataDir); err != nil { return err } @@ -120,6 +118,14 @@ func startZookeeper(fs *flags, t *transporterServer) error { if err := toFile(fmt.Sprintf("%d", t.req.Flag_Zookeeper_R3_5_2Alpha.MyID), ipath); err != nil { return err } + case dbtesterpb.DatabaseID_zookeeper__r3_5_3_beta: + if t.req.Flag_Zookeeper_R3_5_3Beta == nil { + return fmt.Errorf("request 'Flag_Zookeeper_R3_5_3Beta' is nil") + } + plog.Infof("writing Zookeeper myid file %d to %s", t.req.Flag_Zookeeper_R3_5_3Beta.MyID, ipath) + if err := toFile(fmt.Sprintf("%d", t.req.Flag_Zookeeper_R3_5_3Beta.MyID), ipath); err != nil { + return err + } default: return fmt.Errorf("database ID %q is not supported", t.req.DatabaseID) } @@ -153,6 +159,17 @@ func startZookeeper(fs *flags, t *transporterServer) error { Peers: peers, SnapCount: t.req.Flag_Zookeeper_R3_5_2Alpha.SnapCount, } + case dbtesterpb.DatabaseID_zookeeper__r3_5_3_beta: + cfg = ZookeeperConfig{ + TickTime: t.req.Flag_Zookeeper_R3_5_3Beta.TickTime, + DataDir: fs.zkDataDir, + ClientPort: t.req.Flag_Zookeeper_R3_5_3Beta.ClientPort, + InitLimit: t.req.Flag_Zookeeper_R3_5_3Beta.InitLimit, + SyncLimit: t.req.Flag_Zookeeper_R3_5_3Beta.SyncLimit, + MaxClientConnections: t.req.Flag_Zookeeper_R3_5_3Beta.MaxClientConnections, + Peers: peers, + SnapCount: t.req.Flag_Zookeeper_R3_5_3Beta.SnapCount, + } default: return fmt.Errorf("database ID %q is not supported", t.req.DatabaseID) } @@ -219,6 +236,31 @@ func startZookeeper(fs *flags, t *transporterServer) error { } flagString += JavaClassPathZookeeperr352alpha + case dbtesterpb.DatabaseID_zookeeper__r3_5_3_beta: + if t.req.Flag_Zookeeper_R3_5_3Beta.JavaDJuteMaxBuffer != 0 { + if len(flagString) > 0 { + flagString += " " + } + flagString += fmt.Sprintf("-Djute.maxbuffer=%d", t.req.Flag_Zookeeper_R3_5_3Beta.JavaDJuteMaxBuffer) + } + if t.req.Flag_Zookeeper_R3_5_3Beta.JavaDJuteMaxBuffer != 0 { + if len(flagString) > 0 { + flagString += " " + } + flagString += fmt.Sprintf("-Xms%s", t.req.Flag_Zookeeper_R3_5_3Beta.JavaXms) + } + if t.req.Flag_Zookeeper_R3_5_3Beta.JavaDJuteMaxBuffer != 0 { + if len(flagString) > 0 { + flagString += " " + } + flagString += fmt.Sprintf("-Xmx%s", t.req.Flag_Zookeeper_R3_5_3Beta.JavaXmx) + } + // -Djute.maxbuffer=33554432 -Xms50G -Xmx50G + if len(flagString) > 0 { + flagString += " " + } + flagString += JavaClassPathZookeeperr353beta + default: return fmt.Errorf("database ID %q is not supported", t.req.DatabaseID) } diff --git a/dbtesterpb/config_analyze_machine.pb.go b/dbtesterpb/config_analyze_machine.pb.go index fd6b8d7e..29b21d66 100644 --- a/dbtesterpb/config_analyze_machine.pb.go +++ b/dbtesterpb/config_analyze_machine.pb.go @@ -1,6 +1,5 @@ -// Code generated by protoc-gen-gogo. +// Code generated by protoc-gen-gogo. DO NOT EDIT. // source: dbtesterpb/config_analyze_machine.proto -// DO NOT EDIT! /* Package dbtesterpb is a generated protocol buffer package. @@ -29,6 +28,7 @@ Flag_Cetcd_Beta Flag_Consul_V0_7_5 Flag_Consul_V0_8_0 + Flag_Consul_V0_8_3 Flag_Etcd_V2_3 Flag_Etcd_V3_1 Flag_Etcd_V3_2 @@ -36,6 +36,7 @@ Flag_Zetcd_Beta Flag_Zookeeper_R3_4_9 Flag_Zookeeper_R3_5_2Alpha + Flag_Zookeeper_R3_5_3Beta Request Response */ diff --git a/dbtesterpb/config_client_machine.pb.go b/dbtesterpb/config_client_machine.pb.go index ea5b25e6..dc1ccc5a 100644 --- a/dbtesterpb/config_client_machine.pb.go +++ b/dbtesterpb/config_client_machine.pb.go @@ -1,6 +1,5 @@ -// Code generated by protoc-gen-gogo. +// Code generated by protoc-gen-gogo. DO NOT EDIT. // source: dbtesterpb/config_client_machine.proto -// DO NOT EDIT! package dbtesterpb @@ -95,8 +94,10 @@ type ConfigClientMachineAgentControl struct { Flag_Etcd_Tip *Flag_Etcd_Tip `protobuf:"bytes,103,opt,name=flag__etcd__tip,json=flagEtcdTip" json:"flag__etcd__tip,omitempty" yaml:"etcd__tip"` Flag_Zookeeper_R3_4_9 *Flag_Zookeeper_R3_4_9 `protobuf:"bytes,200,opt,name=flag__zookeeper__r3_4_9,json=flagZookeeperR349" json:"flag__zookeeper__r3_4_9,omitempty" yaml:"zookeeper__r3_4_9"` Flag_Zookeeper_R3_5_2Alpha *Flag_Zookeeper_R3_5_2Alpha `protobuf:"bytes,201,opt,name=flag__zookeeper__r3_5_2_alpha,json=flagZookeeperR352Alpha" json:"flag__zookeeper__r3_5_2_alpha,omitempty" yaml:"zookeeper__r3_5_2_alpha"` + Flag_Zookeeper_R3_5_3Beta *Flag_Zookeeper_R3_5_3Beta `protobuf:"bytes,202,opt,name=flag__zookeeper__r3_5_3_beta,json=flagZookeeperR353Beta" json:"flag__zookeeper__r3_5_3_beta,omitempty" yaml:"zookeeper__r3_5_3_beta"` Flag_Consul_V0_7_5 *Flag_Consul_V0_7_5 `protobuf:"bytes,300,opt,name=flag__consul__v0_7_5,json=flagConsulV075" json:"flag__consul__v0_7_5,omitempty" yaml:"consul__v0_7_5"` Flag_Consul_V0_8_0 *Flag_Consul_V0_8_0 `protobuf:"bytes,301,opt,name=flag__consul__v0_8_0,json=flagConsulV080" json:"flag__consul__v0_8_0,omitempty" yaml:"consul__v0_8_0"` + Flag_Consul_V0_8_3 *Flag_Consul_V0_8_3 `protobuf:"bytes,302,opt,name=flag__consul__v0_8_3,json=flagConsulV083" json:"flag__consul__v0_8_3,omitempty" yaml:"consul__v0_8_3"` Flag_Cetcd_Beta *Flag_Cetcd_Beta `protobuf:"bytes,400,opt,name=flag__cetcd__beta,json=flagCetcdBeta" json:"flag__cetcd__beta,omitempty" yaml:"cetcd__beta"` Flag_Zetcd_Beta *Flag_Zetcd_Beta `protobuf:"bytes,500,opt,name=flag__zetcd__beta,json=flagZetcdBeta" json:"flag__zetcd__beta,omitempty" yaml:"zetcd__beta"` ConfigClientMachineBenchmarkOptions *ConfigClientMachineBenchmarkOptions `protobuf:"bytes,1000,opt,name=ConfigClientMachineBenchmarkOptions" json:"ConfigClientMachineBenchmarkOptions,omitempty" yaml:"benchmark_options"` @@ -550,17 +551,29 @@ func (m *ConfigClientMachineAgentControl) MarshalTo(dAtA []byte) (int, error) { } i += n8 } + if m.Flag_Zookeeper_R3_5_3Beta != nil { + dAtA[i] = 0xd2 + i++ + dAtA[i] = 0xc + i++ + i = encodeVarintConfigClientMachine(dAtA, i, uint64(m.Flag_Zookeeper_R3_5_3Beta.Size())) + n9, err := m.Flag_Zookeeper_R3_5_3Beta.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n9 + } if m.Flag_Consul_V0_7_5 != nil { dAtA[i] = 0xe2 i++ dAtA[i] = 0x12 i++ i = encodeVarintConfigClientMachine(dAtA, i, uint64(m.Flag_Consul_V0_7_5.Size())) - n9, err := m.Flag_Consul_V0_7_5.MarshalTo(dAtA[i:]) + n10, err := m.Flag_Consul_V0_7_5.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n9 + i += n10 } if m.Flag_Consul_V0_8_0 != nil { dAtA[i] = 0xea @@ -568,11 +581,23 @@ func (m *ConfigClientMachineAgentControl) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x12 i++ i = encodeVarintConfigClientMachine(dAtA, i, uint64(m.Flag_Consul_V0_8_0.Size())) - n10, err := m.Flag_Consul_V0_8_0.MarshalTo(dAtA[i:]) + n11, err := m.Flag_Consul_V0_8_0.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n10 + i += n11 + } + if m.Flag_Consul_V0_8_3 != nil { + dAtA[i] = 0xf2 + i++ + dAtA[i] = 0x12 + i++ + i = encodeVarintConfigClientMachine(dAtA, i, uint64(m.Flag_Consul_V0_8_3.Size())) + n12, err := m.Flag_Consul_V0_8_3.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n12 } if m.Flag_Cetcd_Beta != nil { dAtA[i] = 0x82 @@ -580,11 +605,11 @@ func (m *ConfigClientMachineAgentControl) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x19 i++ i = encodeVarintConfigClientMachine(dAtA, i, uint64(m.Flag_Cetcd_Beta.Size())) - n11, err := m.Flag_Cetcd_Beta.MarshalTo(dAtA[i:]) + n13, err := m.Flag_Cetcd_Beta.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n11 + i += n13 } if m.Flag_Zetcd_Beta != nil { dAtA[i] = 0xa2 @@ -592,11 +617,11 @@ func (m *ConfigClientMachineAgentControl) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x1f i++ i = encodeVarintConfigClientMachine(dAtA, i, uint64(m.Flag_Zetcd_Beta.Size())) - n12, err := m.Flag_Zetcd_Beta.MarshalTo(dAtA[i:]) + n14, err := m.Flag_Zetcd_Beta.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n12 + i += n14 } if m.ConfigClientMachineBenchmarkOptions != nil { dAtA[i] = 0xc2 @@ -604,11 +629,11 @@ func (m *ConfigClientMachineAgentControl) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x3e i++ i = encodeVarintConfigClientMachine(dAtA, i, uint64(m.ConfigClientMachineBenchmarkOptions.Size())) - n13, err := m.ConfigClientMachineBenchmarkOptions.MarshalTo(dAtA[i:]) + n15, err := m.ConfigClientMachineBenchmarkOptions.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n13 + i += n15 } if m.ConfigClientMachineBenchmarkSteps != nil { dAtA[i] = 0xca @@ -616,11 +641,11 @@ func (m *ConfigClientMachineAgentControl) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x3e i++ i = encodeVarintConfigClientMachine(dAtA, i, uint64(m.ConfigClientMachineBenchmarkSteps.Size())) - n14, err := m.ConfigClientMachineBenchmarkSteps.MarshalTo(dAtA[i:]) + n16, err := m.ConfigClientMachineBenchmarkSteps.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n14 + i += n16 } return i, nil } @@ -844,6 +869,10 @@ func (m *ConfigClientMachineAgentControl) Size() (n int) { l = m.Flag_Zookeeper_R3_5_2Alpha.Size() n += 2 + l + sovConfigClientMachine(uint64(l)) } + if m.Flag_Zookeeper_R3_5_3Beta != nil { + l = m.Flag_Zookeeper_R3_5_3Beta.Size() + n += 2 + l + sovConfigClientMachine(uint64(l)) + } if m.Flag_Consul_V0_7_5 != nil { l = m.Flag_Consul_V0_7_5.Size() n += 2 + l + sovConfigClientMachine(uint64(l)) @@ -852,6 +881,10 @@ func (m *ConfigClientMachineAgentControl) Size() (n int) { l = m.Flag_Consul_V0_8_0.Size() n += 2 + l + sovConfigClientMachine(uint64(l)) } + if m.Flag_Consul_V0_8_3 != nil { + l = m.Flag_Consul_V0_8_3.Size() + n += 2 + l + sovConfigClientMachine(uint64(l)) + } if m.Flag_Cetcd_Beta != nil { l = m.Flag_Cetcd_Beta.Size() n += 2 + l + sovConfigClientMachine(uint64(l)) @@ -2262,6 +2295,39 @@ func (m *ConfigClientMachineAgentControl) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 202: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Flag_Zookeeper_R3_5_3Beta", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfigClientMachine + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfigClientMachine + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Flag_Zookeeper_R3_5_3Beta == nil { + m.Flag_Zookeeper_R3_5_3Beta = &Flag_Zookeeper_R3_5_3Beta{} + } + if err := m.Flag_Zookeeper_R3_5_3Beta.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 300: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Flag_Consul_V0_7_5", wireType) @@ -2328,6 +2394,39 @@ func (m *ConfigClientMachineAgentControl) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 302: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Flag_Consul_V0_8_3", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowConfigClientMachine + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthConfigClientMachine + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Flag_Consul_V0_8_3 == nil { + m.Flag_Consul_V0_8_3 = &Flag_Consul_V0_8_3{} + } + if err := m.Flag_Consul_V0_8_3.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 400: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Flag_Cetcd_Beta", wireType) @@ -2591,116 +2690,119 @@ func init() { } var fileDescriptorConfigClientMachine = []byte{ - // 1761 bytes of a gzipped FileDescriptorProto + // 1811 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x58, 0x6d, 0x6f, 0x1b, 0x49, - 0x1d, 0x3f, 0xd7, 0xed, 0x35, 0x99, 0xb4, 0x4d, 0x33, 0x7d, 0x88, 0x9b, 0xa6, 0x99, 0xdc, 0xa6, - 0xe5, 0x5a, 0x1d, 0xcd, 0x83, 0x9d, 0xde, 0xb5, 0x08, 0x04, 0x75, 0x72, 0x40, 0x95, 0xdc, 0x9d, - 0x59, 0xe7, 0x8a, 0xa8, 0x10, 0xc3, 0x78, 0x3d, 0x59, 0xef, 0x65, 0xbd, 0xb3, 0xec, 0x8c, 0x23, - 0x1c, 0xde, 0x22, 0x21, 0x21, 0x21, 0xdd, 0xcb, 0x7b, 0xc9, 0x07, 0x80, 0xaf, 0x81, 0xca, 0x3b, - 0x3e, 0xc1, 0x0a, 0x7a, 0x42, 0x82, 0xb7, 0x2b, 0x3e, 0x00, 0x9a, 0xff, 0xae, 0xed, 0x59, 0x7b, - 0xe3, 0xf8, 0x9d, 0x77, 0xfe, 0xbf, 0xa7, 0x99, 0x9d, 0xa7, 0x35, 0xfa, 0x4e, 0xbb, 0xa5, 0xb8, - 0x54, 0x3c, 0x0a, 0x5b, 0x5b, 0x8e, 0x08, 0x8e, 0x3d, 0x97, 0x3a, 0xbe, 0xc7, 0x03, 0x45, 0xbb, - 0xcc, 0xe9, 0x78, 0x01, 0xdf, 0x0c, 0x23, 0xa1, 0x04, 0x46, 0x23, 0xdc, 0xca, 0x53, 0xd7, 0x53, - 0x9d, 0x5e, 0x6b, 0xd3, 0x11, 0xdd, 0x2d, 0x57, 0xb8, 0x62, 0x0b, 0x20, 0xad, 0xde, 0x31, 0x3c, - 0xc1, 0x03, 0xfc, 0x4a, 0xa9, 0x2b, 0x2b, 0x86, 0xc5, 0xb1, 0xcf, 0x5c, 0xca, 0x95, 0xd3, 0xce, - 0x6a, 0x64, 0xbc, 0x76, 0x26, 0xc4, 0x09, 0xe7, 0x21, 0x8f, 0x32, 0xc0, 0xea, 0x38, 0xc0, 0x11, - 0x81, 0xec, 0xf9, 0x59, 0xf5, 0xfe, 0x04, 0xdd, 0xd0, 0x9e, 0x28, 0x3a, 0xa3, 0xa2, 0xf5, 0xed, - 0x35, 0xb4, 0xb2, 0x07, 0xfd, 0xdd, 0x83, 0xee, 0x7e, 0x96, 0xf6, 0xf6, 0x55, 0xe0, 0x29, 0x8f, - 0xf9, 0xf8, 0x63, 0x84, 0x1a, 0x4c, 0x75, 0x1a, 0x11, 0x3f, 0xf6, 0x7e, 0x5b, 0x29, 0xad, 0x97, - 0x1e, 0xcf, 0xd7, 0xef, 0x26, 0x31, 0xc1, 0x7d, 0xd6, 0xf5, 0xbf, 0x67, 0x85, 0x4c, 0x75, 0x68, - 0x08, 0x45, 0xcb, 0x36, 0x90, 0xf8, 0x29, 0xba, 0x7a, 0x28, 0x5c, 0xdd, 0x50, 0xb9, 0x04, 0xa4, - 0x5b, 0x49, 0x4c, 0x16, 0x53, 0x92, 0x2f, 0x5c, 0xaa, 0x89, 0x96, 0x3d, 0xc0, 0x60, 0x8a, 0x96, - 0x53, 0xfb, 0x66, 0x5f, 0x2a, 0xde, 0xfd, 0x8c, 0xab, 0xc8, 0x73, 0x24, 0xd0, 0xcb, 0x40, 0x7f, - 0x94, 0xc4, 0xe4, 0x83, 0x94, 0x9e, 0xbd, 0x16, 0x09, 0x48, 0xda, 0x4d, 0xa1, 0x99, 0xe0, 0x79, - 0x2a, 0xf8, 0xf7, 0x25, 0xb4, 0x51, 0x50, 0x7b, 0x15, 0xe8, 0x61, 0x11, 0x3e, 0x53, 0xbc, 0x0d, - 0x6e, 0x97, 0xc1, 0xad, 0x9a, 0xc4, 0x64, 0x73, 0x9a, 0x9b, 0x67, 0xf0, 0x32, 0xeb, 0x59, 0xe4, - 0xf1, 0x1f, 0x4b, 0xe8, 0x51, 0x8a, 0x3b, 0x64, 0x8a, 0x07, 0x4e, 0xff, 0xa8, 0x13, 0x89, 0x9e, - 0xdb, 0x09, 0x7b, 0xea, 0xc8, 0xeb, 0x72, 0xc9, 0x23, 0x8f, 0xa7, 0xdd, 0xbe, 0x02, 0x41, 0x76, - 0x93, 0x98, 0x6c, 0xe7, 0x82, 0xf8, 0x29, 0x8f, 0xaa, 0x21, 0x91, 0xaa, 0x21, 0x33, 0x8b, 0x32, - 0x9b, 0x05, 0xfe, 0x1d, 0x5a, 0xcf, 0x01, 0xf7, 0x3d, 0xa9, 0x22, 0xaf, 0xd5, 0x53, 0x9e, 0x08, - 0x5e, 0xfa, 0x3e, 0xc4, 0x78, 0x1f, 0x62, 0x6c, 0x25, 0x31, 0xf9, 0xa8, 0x30, 0x46, 0xdb, 0xe0, - 0x50, 0xe6, 0xfb, 0x59, 0x82, 0x0b, 0x85, 0xf1, 0xd7, 0x25, 0xf4, 0xe1, 0xb9, 0xa0, 0x06, 0x8f, - 0x1c, 0x1e, 0x28, 0xcf, 0xe7, 0x10, 0xe2, 0x2a, 0x84, 0xf8, 0x38, 0x89, 0x49, 0xf5, 0xe2, 0x10, - 0xe1, 0x90, 0x9b, 0x65, 0x99, 0xd5, 0x06, 0xff, 0xa1, 0x84, 0x1e, 0x9e, 0x8b, 0x6d, 0xf6, 0xba, - 0x5d, 0x16, 0xf5, 0x21, 0xcf, 0x1c, 0xe4, 0xa9, 0x25, 0x31, 0xd9, 0xba, 0x38, 0x8f, 0x4c, 0x89, - 0x59, 0x98, 0x99, 0x0c, 0x70, 0x88, 0x56, 0x73, 0xb8, 0x7a, 0xff, 0x80, 0xf7, 0x3f, 0xef, 0x75, - 0x5b, 0x3c, 0x82, 0x00, 0xf3, 0x10, 0xe0, 0xbb, 0x49, 0x4c, 0x1e, 0x17, 0x06, 0x68, 0xf5, 0xe9, - 0x09, 0xef, 0xd3, 0x00, 0x18, 0x99, 0xf3, 0x54, 0x45, 0xdc, 0x47, 0xa4, 0xc9, 0xa3, 0x53, 0x1e, - 0xed, 0x7b, 0xf2, 0xa4, 0x19, 0x32, 0x87, 0x7f, 0x29, 0x99, 0xcb, 0xcd, 0x5e, 0xa3, 0xf1, 0xa9, - 0x20, 0x81, 0xa0, 0x7b, 0x7b, 0x42, 0xa5, 0xa6, 0xd0, 0x9e, 0xe6, 0x8c, 0xf5, 0xf8, 0x22, 0x5d, - 0xfc, 0x4b, 0x74, 0xf7, 0x27, 0x42, 0xb8, 0x3e, 0xdf, 0xf3, 0x45, 0xaf, 0xdd, 0x88, 0xc4, 0x57, - 0xdc, 0x51, 0x9f, 0xb3, 0x2e, 0xaf, 0xb4, 0xc1, 0xf1, 0x61, 0x12, 0x93, 0xf5, 0xd4, 0xd1, 0x05, - 0x1c, 0x75, 0x34, 0x90, 0x86, 0x29, 0x92, 0x06, 0xac, 0xcb, 0x2d, 0xfb, 0x1c, 0x0d, 0x7c, 0x8c, - 0xee, 0x19, 0x95, 0xa6, 0x12, 0x11, 0x73, 0xf9, 0x01, 0x4f, 0xbb, 0xc4, 0xc1, 0xe0, 0x71, 0x12, - 0x93, 0x87, 0x05, 0x06, 0x32, 0x05, 0xc3, 0x50, 0xa6, 0x7d, 0x39, 0x5f, 0x0a, 0xef, 0xa2, 0x3b, - 0x85, 0xc5, 0xca, 0xb1, 0xf6, 0xb0, 0x8b, 0x8b, 0x58, 0xa0, 0xd5, 0xc9, 0x42, 0xbd, 0xe7, 0x9c, - 0xf0, 0x74, 0x04, 0x5c, 0x08, 0xf8, 0x51, 0x12, 0x93, 0x0f, 0xa7, 0x04, 0x6c, 0x01, 0x21, 0x1b, - 0x88, 0xa9, 0x82, 0xb8, 0x87, 0xd6, 0x26, 0xeb, 0xcd, 0x5e, 0x6b, 0xdf, 0x8b, 0xb8, 0xa3, 0x44, - 0xd4, 0xaf, 0x74, 0xc0, 0xf2, 0x69, 0x12, 0x93, 0x27, 0x53, 0x2c, 0x65, 0xaf, 0x45, 0xdb, 0x03, - 0x8e, 0x65, 0x5f, 0x20, 0x6a, 0xfd, 0xed, 0x0a, 0xda, 0x28, 0x38, 0x65, 0xea, 0x3c, 0x70, 0x3a, - 0x5d, 0x16, 0x9d, 0x7c, 0x11, 0xea, 0x25, 0x20, 0xf1, 0x06, 0xba, 0x7c, 0xd4, 0x0f, 0x79, 0x76, - 0xd0, 0x2c, 0x26, 0x31, 0x59, 0x48, 0x43, 0xa8, 0x7e, 0xc8, 0x2d, 0x1b, 0x8a, 0xf8, 0x87, 0xe8, - 0xba, 0xcd, 0x7f, 0xd3, 0xe3, 0x52, 0xa5, 0x13, 0x18, 0x4e, 0x98, 0x72, 0xfd, 0x5e, 0x12, 0x93, - 0x3b, 0x29, 0x3a, 0x4a, 0xcb, 0xd9, 0x02, 0xb0, 0xec, 0x3c, 0x1e, 0xff, 0x14, 0xdd, 0xdc, 0x13, - 0x41, 0xc0, 0x1d, 0x6d, 0x9a, 0x69, 0x94, 0x41, 0x63, 0x35, 0x89, 0x49, 0x25, 0x5b, 0x52, 0x43, - 0xc4, 0x50, 0x66, 0x82, 0x85, 0xbf, 0x8f, 0xae, 0xa5, 0x1d, 0xca, 0x54, 0x2e, 0x83, 0x4a, 0x25, - 0x89, 0xc9, 0xed, 0xdc, 0xc2, 0x1c, 0x28, 0xe4, 0xd0, 0xf8, 0x57, 0x68, 0x79, 0xa4, 0x68, 0x56, - 0x64, 0xe5, 0xca, 0x7a, 0xf9, 0x71, 0xd9, 0x9c, 0xfa, 0x46, 0x9c, 0x9c, 0xa6, 0xd4, 0x87, 0x5e, - 0xb1, 0x08, 0xf6, 0xd0, 0x8a, 0xcd, 0x14, 0x3f, 0xf4, 0xba, 0x9e, 0xca, 0x46, 0x40, 0x36, 0x78, - 0xd4, 0xe4, 0x8e, 0x08, 0xda, 0xb0, 0xb5, 0x97, 0xeb, 0x4f, 0x92, 0x98, 0x3c, 0xca, 0x46, 0x8d, - 0x29, 0x4e, 0x7d, 0x0d, 0xa6, 0xd9, 0x00, 0x4a, 0xbd, 0x9b, 0x52, 0x09, 0x78, 0xcb, 0x9e, 0x22, - 0xa6, 0xcf, 0xfb, 0x26, 0xeb, 0xc2, 0x84, 0xd7, 0xbb, 0xf5, 0x9c, 0x79, 0xde, 0x4b, 0xd6, 0x85, - 0x45, 0x64, 0xd9, 0x03, 0x0c, 0xfe, 0x01, 0xba, 0x76, 0xc0, 0xfb, 0x4d, 0xef, 0x8c, 0xd7, 0xfb, - 0x8a, 0x4b, 0xd8, 0x51, 0x73, 0x6f, 0x50, 0xaf, 0x39, 0xe9, 0x9d, 0x71, 0xda, 0xd2, 0x75, 0xcb, - 0xce, 0xc1, 0xf1, 0x1e, 0xba, 0xf1, 0x9a, 0xf9, 0x3d, 0x3e, 0x12, 0x98, 0x07, 0x81, 0xfb, 0x49, - 0x4c, 0x96, 0x53, 0x81, 0x53, 0x5d, 0xcf, 0x49, 0x8c, 0x51, 0x70, 0x0d, 0xcd, 0x37, 0x15, 0xf3, - 0xb9, 0xcd, 0x59, 0x1b, 0x36, 0xb7, 0xb9, 0xfa, 0x9d, 0x24, 0x26, 0x4b, 0x59, 0x68, 0x5d, 0xa2, - 0x11, 0x67, 0x6d, 0xcb, 0x1e, 0xe1, 0xac, 0xf8, 0x12, 0xfa, 0x60, 0xda, 0x44, 0x6e, 0x2a, 0x1e, - 0x4a, 0xfc, 0x05, 0xc2, 0xfa, 0xc7, 0x4e, 0x53, 0xb1, 0x48, 0xed, 0x33, 0xc5, 0x5a, 0x4c, 0xa6, - 0x93, 0x7a, 0xae, 0x4e, 0x92, 0x98, 0xdc, 0x1f, 0x78, 0xf0, 0x70, 0x87, 0x4a, 0x0d, 0xa2, 0xed, - 0x0c, 0x65, 0xd9, 0x05, 0x54, 0x6c, 0xa3, 0x5b, 0xba, 0xb5, 0xda, 0x54, 0x11, 0x97, 0x72, 0xa8, - 0x78, 0x09, 0x14, 0xd7, 0x93, 0x98, 0xac, 0x8e, 0x14, 0xab, 0x54, 0x02, 0xca, 0x90, 0x2c, 0x22, - 0xe3, 0x43, 0xb4, 0xa4, 0x9b, 0x6b, 0x4d, 0x25, 0xc2, 0xa1, 0x62, 0x19, 0x14, 0xd7, 0x92, 0x98, - 0xac, 0x8c, 0x14, 0x6b, 0x7a, 0xd9, 0x87, 0x86, 0xde, 0x24, 0x11, 0xff, 0x18, 0x2d, 0xea, 0xc6, - 0xdd, 0x2f, 0x43, 0x5f, 0xb0, 0xf6, 0xa1, 0x70, 0x25, 0x2c, 0x86, 0x39, 0x73, 0x49, 0x69, 0xad, - 0x5d, 0xda, 0x03, 0x04, 0xf5, 0x85, 0x2b, 0x2d, 0x7b, 0x9c, 0x64, 0xfd, 0x7b, 0x11, 0x91, 0x82, - 0x01, 0x7e, 0xe9, 0xf2, 0x40, 0xed, 0x89, 0x40, 0x45, 0x02, 0x2e, 0xa5, 0x03, 0xdf, 0x57, 0xfb, - 0x93, 0x97, 0xd2, 0x41, 0x4e, 0xea, 0xb5, 0x2d, 0xdb, 0x40, 0xe2, 0x9f, 0xa1, 0x5b, 0x83, 0xa7, - 0x7d, 0x2e, 0x9d, 0xc8, 0x83, 0x5d, 0x27, 0xbb, 0xa0, 0x1a, 0xef, 0x65, 0x28, 0xd0, 0x1e, 0xa1, - 0x2c, 0xbb, 0x88, 0x8b, 0x5f, 0xa0, 0x85, 0x41, 0xf3, 0x11, 0x73, 0xb3, 0xcb, 0xea, 0x72, 0x12, - 0x93, 0x5b, 0x63, 0x52, 0x8a, 0xb9, 0x96, 0x6d, 0x62, 0xf5, 0x92, 0x69, 0x70, 0x1e, 0xbd, 0x6a, - 0xe8, 0x91, 0x2a, 0xe7, 0xaf, 0xc8, 0x21, 0xe7, 0x11, 0xf5, 0x42, 0x69, 0xd9, 0x03, 0x0c, 0xfe, - 0x11, 0xba, 0x9e, 0xfd, 0x6c, 0xaa, 0xc8, 0x0b, 0xdc, 0xec, 0x86, 0xb8, 0x92, 0xc4, 0xe4, 0x6e, - 0x9e, 0xa4, 0xdf, 0xbf, 0x17, 0xb8, 0x96, 0x9d, 0x27, 0xe0, 0x06, 0xc2, 0x30, 0x8c, 0x0d, 0x11, - 0xa9, 0x23, 0x91, 0x6d, 0x1a, 0xd9, 0x36, 0x60, 0xcc, 0x21, 0xa6, 0x31, 0x34, 0x14, 0x91, 0xa2, - 0x4a, 0xd0, 0x6c, 0xdf, 0xb1, 0xec, 0x02, 0x2e, 0xae, 0xa3, 0x1b, 0xd0, 0xfa, 0x69, 0xd0, 0x0e, - 0x85, 0x17, 0x28, 0x59, 0xb9, 0x0a, 0x3d, 0x31, 0x42, 0xa5, 0x6a, 0x7c, 0x00, 0xb0, 0xec, 0x31, - 0x06, 0xfe, 0x05, 0xba, 0x33, 0x18, 0x95, 0x7c, 0xb0, 0x74, 0x4f, 0xd8, 0x48, 0x62, 0x42, 0xc6, - 0xc6, 0x72, 0x22, 0x5b, 0xb1, 0x02, 0x3e, 0x40, 0x4b, 0x83, 0xc2, 0x28, 0xe1, 0x3c, 0x24, 0x7c, - 0x90, 0xc4, 0xe4, 0xde, 0x98, 0xac, 0x11, 0x72, 0x92, 0x87, 0xdf, 0xa0, 0x9b, 0xf0, 0xf1, 0x04, - 0x5f, 0x6d, 0x94, 0x9e, 0x56, 0x69, 0x0d, 0x2e, 0x28, 0x0b, 0xd5, 0xd5, 0xcd, 0xd1, 0x07, 0xd6, - 0xe6, 0x38, 0xc6, 0xdc, 0x53, 0x46, 0xad, 0x96, 0xbd, 0xa0, 0x81, 0x9f, 0x2a, 0xa7, 0xfd, 0xba, - 0x5a, 0x9b, 0xd0, 0xae, 0xd1, 0x1d, 0xb8, 0x9b, 0x4c, 0xd3, 0xae, 0xd1, 0x9d, 0x02, 0xed, 0x1a, - 0xdd, 0x31, 0xb5, 0x6b, 0x3b, 0x05, 0xda, 0x55, 0xb8, 0x93, 0x4c, 0xd7, 0xae, 0x16, 0x6a, 0x57, - 0x73, 0xda, 0x55, 0xfc, 0x73, 0xb4, 0x68, 0xf2, 0x94, 0x17, 0xc2, 0x8d, 0x65, 0xa1, 0x7a, 0xff, - 0x3c, 0x69, 0xe5, 0x85, 0xf5, 0xdb, 0x49, 0x4c, 0x6e, 0x9a, 0xca, 0xca, 0x0b, 0x0d, 0xe1, 0x23, - 0x2f, 0xc4, 0xa7, 0x68, 0x39, 0x65, 0x0d, 0x3f, 0x83, 0x29, 0x8d, 0x6a, 0x74, 0x97, 0xbe, 0xa8, - 0xbc, 0x2d, 0x81, 0xc3, 0xc6, 0xa4, 0xc3, 0x04, 0xd6, 0xdc, 0x7b, 0x26, 0x8a, 0x96, 0xbd, 0xa4, - 0x69, 0x6f, 0x06, 0xed, 0x76, 0x6d, 0xf7, 0x05, 0xfe, 0x53, 0x09, 0x3d, 0x28, 0x12, 0x7b, 0x46, - 0xab, 0x94, 0xf9, 0x61, 0x87, 0x55, 0xfe, 0x9e, 0xda, 0x3f, 0xb9, 0xc8, 0x7e, 0xc8, 0xa8, 0x5b, - 0x49, 0x4c, 0xd6, 0x8a, 0x42, 0x0c, 0x21, 0x96, 0x7d, 0x77, 0x2c, 0xca, 0xb3, 0xea, 0x4b, 0x5d, - 0xc0, 0x5f, 0xa1, 0xdb, 0xa9, 0x78, 0xfa, 0xb5, 0x4f, 0xe9, 0xe9, 0x36, 0xfd, 0x84, 0x3e, 0xab, - 0xfc, 0xe5, 0x12, 0xa4, 0x58, 0x9f, 0x4c, 0x91, 0x07, 0x9a, 0x47, 0x6a, 0xbe, 0x62, 0xd9, 0x37, - 0x34, 0x61, 0x0f, 0x1a, 0x5f, 0x6f, 0x7f, 0xf2, 0xac, 0xd0, 0xeb, 0x39, 0xdd, 0xae, 0xfc, 0x75, - 0x16, 0xaf, 0xe7, 0x74, 0xfb, 0x1c, 0xaf, 0xe7, 0x74, 0x7b, 0xcc, 0xeb, 0xf9, 0x36, 0xfe, 0x35, - 0x5a, 0xca, 0x24, 0xd2, 0x19, 0xd0, 0xe2, 0x8a, 0x55, 0xbe, 0x2e, 0x83, 0xd1, 0x83, 0x02, 0xa3, - 0x11, 0xca, 0xdc, 0xe8, 0x8d, 0x66, 0xcb, 0xbe, 0x0e, 0x16, 0xba, 0xa5, 0xce, 0x15, 0x1b, 0x39, - 0x9c, 0x19, 0x0e, 0xff, 0x3b, 0xd7, 0xe1, 0xac, 0xd8, 0xe1, 0x6c, 0xc2, 0xe1, 0xcd, 0xd0, 0xe1, - 0xcf, 0xa5, 0x99, 0xee, 0xb4, 0x95, 0xff, 0x5c, 0x05, 0xd3, 0x2d, 0xd3, 0x74, 0x06, 0x9e, 0x39, - 0x79, 0x5b, 0x83, 0x1a, 0x15, 0x69, 0xd1, 0xb2, 0x67, 0xba, 0x4e, 0x7f, 0x53, 0x9a, 0xe1, 0xb6, - 0x52, 0xf9, 0x6f, 0x1a, 0xf0, 0xe9, 0xac, 0x01, 0x81, 0x65, 0xee, 0xf1, 0xa3, 0x78, 0xfa, 0x84, - 0x97, 0x96, 0x7d, 0xb1, 0x69, 0xfd, 0xf6, 0xdb, 0x7f, 0xad, 0xbd, 0xf7, 0xf6, 0xdd, 0x5a, 0xe9, - 0x1f, 0xef, 0xd6, 0x4a, 0xff, 0x7c, 0xb7, 0x56, 0xfa, 0xe6, 0xdb, 0xb5, 0xf7, 0x5a, 0xef, 0xc3, - 0x9f, 0x52, 0xb5, 0xff, 0x07, 0x00, 0x00, 0xff, 0xff, 0xc1, 0x09, 0x69, 0xa2, 0x8e, 0x13, 0x00, - 0x00, + 0x1d, 0x3f, 0x37, 0xed, 0x35, 0x99, 0xf4, 0x29, 0xd3, 0xa6, 0x71, 0xd3, 0x34, 0x93, 0x6e, 0x5a, + 0x2e, 0xd5, 0xd1, 0x3c, 0x78, 0xd3, 0xbb, 0x16, 0x81, 0xa0, 0x4e, 0x0e, 0xa8, 0x9a, 0xbb, 0x0b, + 0xeb, 0x5c, 0x11, 0x15, 0x62, 0x18, 0xaf, 0x27, 0xeb, 0xbd, 0xac, 0x77, 0x96, 0x9d, 0x71, 0x84, + 0xc3, 0x5b, 0x24, 0x04, 0x12, 0xd2, 0xbd, 0xbc, 0x97, 0x7c, 0x00, 0xe0, 0x63, 0xa0, 0xc2, 0x2b, + 0xbe, 0x00, 0x2b, 0x68, 0xdf, 0xc0, 0xdb, 0x15, 0x1f, 0xe0, 0x34, 0xff, 0x59, 0xdb, 0x6b, 0x7b, + 0xed, 0xf8, 0x9d, 0x77, 0xfe, 0xbf, 0xa7, 0x99, 0x9d, 0xa7, 0x35, 0xfa, 0x56, 0xa3, 0xae, 0xb8, + 0x54, 0x3c, 0x8e, 0xea, 0x5b, 0xae, 0x08, 0x8f, 0x7d, 0x8f, 0xba, 0x81, 0xcf, 0x43, 0x45, 0x5b, + 0xcc, 0x6d, 0xfa, 0x21, 0xdf, 0x8c, 0x62, 0xa1, 0x04, 0x46, 0x7d, 0xdc, 0xf2, 0x63, 0xcf, 0x57, + 0xcd, 0x76, 0x7d, 0xd3, 0x15, 0xad, 0x2d, 0x4f, 0x78, 0x62, 0x0b, 0x20, 0xf5, 0xf6, 0x31, 0x3c, + 0xc1, 0x03, 0xfc, 0x32, 0xd4, 0xe5, 0xe5, 0x9c, 0xc5, 0x71, 0xc0, 0x3c, 0xca, 0x95, 0xdb, 0xc8, + 0x6a, 0x64, 0xb8, 0x76, 0x26, 0xc4, 0x09, 0xe7, 0x11, 0x8f, 0x33, 0xc0, 0xca, 0x30, 0xc0, 0x15, + 0xa1, 0x6c, 0x07, 0x59, 0xf5, 0xee, 0x08, 0x3d, 0xa7, 0x3d, 0x52, 0x74, 0xfb, 0x45, 0xeb, 0xdd, + 0x15, 0xb4, 0xbc, 0x07, 0xfd, 0xdd, 0x83, 0xee, 0x7e, 0x6a, 0x7a, 0xfb, 0x22, 0xf4, 0x95, 0xcf, + 0x02, 0xfc, 0x11, 0x42, 0x87, 0x4c, 0x35, 0x0f, 0x63, 0x7e, 0xec, 0xff, 0xba, 0x5c, 0x5a, 0x2b, + 0x6d, 0xcc, 0x55, 0x6f, 0xa7, 0x09, 0xc1, 0x1d, 0xd6, 0x0a, 0xbe, 0x63, 0x45, 0x4c, 0x35, 0x69, + 0x04, 0x45, 0xcb, 0xc9, 0x21, 0xf1, 0x63, 0x74, 0xf9, 0x40, 0x78, 0xba, 0xa1, 0x7c, 0x01, 0x48, + 0x37, 0xd3, 0x84, 0x5c, 0x37, 0xa4, 0x40, 0x78, 0x54, 0x13, 0x2d, 0xa7, 0x8b, 0xc1, 0x14, 0x2d, + 0x19, 0xfb, 0x5a, 0x47, 0x2a, 0xde, 0xfa, 0x94, 0xab, 0xd8, 0x77, 0x25, 0xd0, 0x67, 0x80, 0xfe, + 0x30, 0x4d, 0xc8, 0x7d, 0x43, 0xcf, 0x5e, 0x8b, 0x04, 0x24, 0x6d, 0x19, 0x68, 0x26, 0x38, 0x4e, + 0x05, 0xff, 0xb6, 0x84, 0xd6, 0x0b, 0x6a, 0x2f, 0x42, 0x3d, 0x2c, 0x22, 0x60, 0x8a, 0x37, 0xc0, + 0xed, 0x22, 0xb8, 0x55, 0xd2, 0x84, 0x6c, 0x4e, 0x72, 0xf3, 0x73, 0xbc, 0xcc, 0x7a, 0x1a, 0x79, + 0xfc, 0x87, 0x12, 0x7a, 0x68, 0x70, 0x07, 0x4c, 0xf1, 0xd0, 0xed, 0x1c, 0x35, 0x63, 0xd1, 0xf6, + 0x9a, 0x51, 0x5b, 0x1d, 0xf9, 0x2d, 0x2e, 0x79, 0xec, 0x73, 0xd3, 0xed, 0x4b, 0x10, 0x64, 0x37, + 0x4d, 0xc8, 0xf6, 0x40, 0x90, 0xc0, 0xf0, 0xa8, 0xea, 0x11, 0xa9, 0xea, 0x31, 0xb3, 0x28, 0xd3, + 0x59, 0xe0, 0xdf, 0xa0, 0xb5, 0x01, 0xe0, 0xbe, 0x2f, 0x55, 0xec, 0xd7, 0xdb, 0xca, 0x17, 0xe1, + 0xf3, 0x20, 0x80, 0x18, 0xef, 0x43, 0x8c, 0xad, 0x34, 0x21, 0x1f, 0x16, 0xc6, 0x68, 0xe4, 0x38, + 0x94, 0x05, 0x41, 0x96, 0xe0, 0x5c, 0x61, 0xfc, 0x55, 0x09, 0x7d, 0x30, 0x16, 0x74, 0xc8, 0x63, + 0x97, 0x87, 0xca, 0x0f, 0x38, 0x84, 0xb8, 0x0c, 0x21, 0x3e, 0x4a, 0x13, 0x52, 0x39, 0x3f, 0x44, + 0xd4, 0xe3, 0x66, 0x59, 0xa6, 0xb5, 0xc1, 0xbf, 0x2b, 0xa1, 0x07, 0x63, 0xb1, 0xb5, 0x76, 0xab, + 0xc5, 0xe2, 0x0e, 0xe4, 0x99, 0x85, 0x3c, 0x76, 0x9a, 0x90, 0xad, 0xf3, 0xf3, 0x48, 0x43, 0xcc, + 0xc2, 0x4c, 0x65, 0x80, 0x23, 0xb4, 0x32, 0x80, 0xab, 0x76, 0x5e, 0xf2, 0xce, 0x67, 0xed, 0x56, + 0x9d, 0xc7, 0x10, 0x60, 0x0e, 0x02, 0x7c, 0x3b, 0x4d, 0xc8, 0x46, 0x61, 0x80, 0x7a, 0x87, 0x9e, + 0xf0, 0x0e, 0x0d, 0x81, 0x91, 0x39, 0x4f, 0x54, 0xc4, 0x1d, 0x44, 0x6a, 0x3c, 0x3e, 0xe5, 0xf1, + 0xbe, 0x2f, 0x4f, 0x6a, 0x11, 0x73, 0xf9, 0x17, 0x92, 0x79, 0x3c, 0xdf, 0x6b, 0x34, 0x3c, 0x15, + 0x24, 0x10, 0x74, 0x6f, 0x4f, 0xa8, 0xd4, 0x14, 0xda, 0xd6, 0x9c, 0xa1, 0x1e, 0x9f, 0xa7, 0x8b, + 0x7f, 0x8e, 0x6e, 0xff, 0x48, 0x08, 0x2f, 0xe0, 0x7b, 0x81, 0x68, 0x37, 0x0e, 0x63, 0xf1, 0x25, + 0x77, 0xd5, 0x67, 0xac, 0xc5, 0xcb, 0x0d, 0x70, 0x7c, 0x90, 0x26, 0x64, 0xcd, 0x38, 0x7a, 0x80, + 0xa3, 0xae, 0x06, 0xd2, 0xc8, 0x20, 0x69, 0xc8, 0x5a, 0xdc, 0x72, 0xc6, 0x68, 0xe0, 0x63, 0x74, + 0x27, 0x57, 0xa9, 0x29, 0x11, 0x33, 0x8f, 0xbf, 0xe4, 0xa6, 0x4b, 0x1c, 0x0c, 0x36, 0xd2, 0x84, + 0x3c, 0x28, 0x30, 0x90, 0x06, 0x0c, 0x43, 0x69, 0xfa, 0x32, 0x5e, 0x0a, 0xef, 0xa2, 0xc5, 0xc2, + 0x62, 0xf9, 0x58, 0x7b, 0x38, 0xc5, 0x45, 0x2c, 0xd0, 0xca, 0x68, 0xa1, 0xda, 0x76, 0x4f, 0xb8, + 0x19, 0x01, 0x0f, 0x02, 0x7e, 0x98, 0x26, 0xe4, 0x83, 0x09, 0x01, 0xeb, 0x40, 0xc8, 0x06, 0x62, + 0xa2, 0x20, 0x6e, 0xa3, 0xd5, 0xd1, 0x7a, 0xad, 0x5d, 0xdf, 0xf7, 0x63, 0xee, 0x2a, 0x11, 0x77, + 0xca, 0x4d, 0xb0, 0x7c, 0x9c, 0x26, 0xe4, 0xd1, 0x04, 0x4b, 0xd9, 0xae, 0xd3, 0x46, 0x97, 0x63, + 0x39, 0xe7, 0x88, 0x5a, 0x7f, 0xbb, 0x84, 0xd6, 0x0b, 0x4e, 0x99, 0x2a, 0x0f, 0xdd, 0x66, 0x8b, + 0xc5, 0x27, 0x9f, 0x47, 0x7a, 0x09, 0x48, 0xbc, 0x8e, 0x2e, 0x1e, 0x75, 0x22, 0x9e, 0x1d, 0x34, + 0xd7, 0xd3, 0x84, 0xcc, 0x9b, 0x10, 0xaa, 0x13, 0x71, 0xcb, 0x81, 0x22, 0xfe, 0x3e, 0xba, 0xea, + 0xf0, 0x5f, 0xb5, 0xb9, 0x54, 0x66, 0x02, 0xc3, 0x09, 0x33, 0x53, 0xbd, 0x93, 0x26, 0x64, 0xd1, + 0xa0, 0x63, 0x53, 0xce, 0x16, 0x80, 0xe5, 0x0c, 0xe2, 0xf1, 0x8f, 0xd1, 0x8d, 0x3d, 0x11, 0x86, + 0xdc, 0xd5, 0xa6, 0x99, 0xc6, 0x0c, 0x68, 0xac, 0xa4, 0x09, 0x29, 0x67, 0x4b, 0xaa, 0x87, 0xe8, + 0xc9, 0x8c, 0xb0, 0xf0, 0x77, 0xd1, 0x15, 0xd3, 0xa1, 0x4c, 0xe5, 0x22, 0xa8, 0x94, 0xd3, 0x84, + 0xdc, 0x1a, 0x58, 0x98, 0x5d, 0x85, 0x01, 0x34, 0xfe, 0x05, 0x5a, 0xea, 0x2b, 0xe6, 0x2b, 0xb2, + 0x7c, 0x69, 0x6d, 0x66, 0x63, 0x26, 0x3f, 0xf5, 0x73, 0x71, 0x06, 0x34, 0xa5, 0x3e, 0xf4, 0x8a, + 0x45, 0xb0, 0x8f, 0x96, 0x1d, 0xa6, 0xf8, 0x81, 0xdf, 0xf2, 0x55, 0x36, 0x02, 0xf2, 0x90, 0xc7, + 0x35, 0xee, 0x8a, 0xb0, 0x01, 0x5b, 0xfb, 0x4c, 0xf5, 0x51, 0x9a, 0x90, 0x87, 0xd9, 0xa8, 0x31, + 0xc5, 0x69, 0xa0, 0xc1, 0x34, 0x1b, 0x40, 0xa9, 0x77, 0x53, 0x2a, 0x01, 0x6f, 0x39, 0x13, 0xc4, + 0xf4, 0x79, 0x5f, 0x63, 0x2d, 0x98, 0xf0, 0x7a, 0xb7, 0x9e, 0xcd, 0x9f, 0xf7, 0x92, 0xb5, 0x60, + 0x11, 0x59, 0x4e, 0x17, 0x83, 0xbf, 0x87, 0xae, 0xbc, 0xe4, 0x9d, 0x9a, 0x7f, 0xc6, 0xab, 0x1d, + 0xc5, 0x25, 0xec, 0xa8, 0x03, 0x6f, 0x50, 0xaf, 0x39, 0xe9, 0x9f, 0x71, 0x5a, 0xd7, 0x75, 0xcb, + 0x19, 0x80, 0xe3, 0x3d, 0x74, 0xed, 0x15, 0x0b, 0xda, 0xbc, 0x2f, 0x30, 0x07, 0x02, 0x77, 0xd3, + 0x84, 0x2c, 0x19, 0x81, 0x53, 0x5d, 0x1f, 0x90, 0x18, 0xa2, 0x60, 0x1b, 0xcd, 0xd5, 0x14, 0x0b, + 0xb8, 0xc3, 0x59, 0x03, 0x36, 0xb7, 0xd9, 0xea, 0x62, 0x9a, 0x90, 0x85, 0x2c, 0xb4, 0x2e, 0xd1, + 0x98, 0xb3, 0x86, 0xe5, 0xf4, 0x71, 0x56, 0x72, 0x01, 0xdd, 0x9f, 0x34, 0x91, 0x6b, 0x8a, 0x47, + 0x12, 0x7f, 0x8e, 0xb0, 0xfe, 0xb1, 0x53, 0x53, 0x2c, 0x56, 0xfb, 0x4c, 0xb1, 0x3a, 0x93, 0x66, + 0x52, 0xcf, 0x56, 0x49, 0x9a, 0x90, 0xbb, 0x5d, 0x0f, 0x1e, 0xed, 0x50, 0xa9, 0x41, 0xb4, 0x91, + 0xa1, 0x2c, 0xa7, 0x80, 0x8a, 0x1d, 0x74, 0x53, 0xb7, 0x56, 0x6a, 0x2a, 0xe6, 0x52, 0xf6, 0x14, + 0x2f, 0x80, 0xe2, 0x5a, 0x9a, 0x90, 0x95, 0xbe, 0x62, 0x85, 0x4a, 0x40, 0xe5, 0x24, 0x8b, 0xc8, + 0xf8, 0x00, 0x2d, 0xe8, 0x66, 0xbb, 0xa6, 0x44, 0xd4, 0x53, 0x9c, 0x01, 0xc5, 0xd5, 0x34, 0x21, + 0xcb, 0x7d, 0x45, 0x5b, 0x2f, 0xfb, 0x28, 0xa7, 0x37, 0x4a, 0xc4, 0x3f, 0x44, 0xd7, 0x75, 0xe3, + 0xee, 0x17, 0x51, 0x20, 0x58, 0xe3, 0x40, 0x78, 0x12, 0x16, 0xc3, 0x6c, 0x7e, 0x49, 0x69, 0xad, + 0x5d, 0xda, 0x06, 0x04, 0x0d, 0x84, 0x27, 0x2d, 0x67, 0x98, 0x64, 0xfd, 0x6b, 0x01, 0x91, 0x82, + 0x01, 0x7e, 0xee, 0xf1, 0x50, 0xed, 0x89, 0x50, 0xc5, 0x02, 0x2e, 0xa5, 0x5d, 0xdf, 0x17, 0xfb, + 0xa3, 0x97, 0xd2, 0x6e, 0x4e, 0xea, 0x37, 0x2c, 0x27, 0x87, 0xc4, 0x3f, 0x41, 0x37, 0xbb, 0x4f, + 0xfb, 0x5c, 0xba, 0xb1, 0x0f, 0xbb, 0x4e, 0x76, 0x41, 0xcd, 0xbd, 0x97, 0x9e, 0x40, 0xa3, 0x8f, + 0xb2, 0x9c, 0x22, 0x2e, 0x7e, 0x86, 0xe6, 0xbb, 0xcd, 0x47, 0xcc, 0xcb, 0x2e, 0xab, 0x4b, 0x69, + 0x42, 0x6e, 0x0e, 0x49, 0x29, 0xe6, 0x59, 0x4e, 0x1e, 0xab, 0x97, 0xcc, 0x21, 0xe7, 0xf1, 0x8b, + 0x43, 0x3d, 0x52, 0x33, 0x83, 0x57, 0xe4, 0x88, 0xf3, 0x98, 0xfa, 0x91, 0xb4, 0x9c, 0x2e, 0x06, + 0xff, 0x00, 0x5d, 0xcd, 0x7e, 0xd6, 0x54, 0xec, 0x87, 0x5e, 0x76, 0x43, 0x5c, 0x4e, 0x13, 0x72, + 0x7b, 0x90, 0xa4, 0xdf, 0xbf, 0x1f, 0x7a, 0x96, 0x33, 0x48, 0xc0, 0x87, 0x08, 0xc3, 0x30, 0x1e, + 0x8a, 0x58, 0x1d, 0x89, 0x6c, 0xd3, 0xc8, 0xb6, 0x81, 0xdc, 0x1c, 0x62, 0x1a, 0x43, 0x23, 0x11, + 0x2b, 0xaa, 0x04, 0xcd, 0xf6, 0x1d, 0xcb, 0x29, 0xe0, 0xe2, 0x2a, 0xba, 0x06, 0xad, 0x9f, 0x84, + 0x8d, 0x48, 0xf8, 0xa1, 0x92, 0xe5, 0xcb, 0xd0, 0x93, 0x5c, 0x28, 0xa3, 0xc6, 0xbb, 0x00, 0xcb, + 0x19, 0x62, 0xe0, 0x9f, 0xa1, 0xc5, 0xee, 0xa8, 0x0c, 0x06, 0x33, 0x7b, 0xc2, 0x7a, 0x9a, 0x10, + 0x32, 0x34, 0x96, 0x23, 0xd9, 0x8a, 0x15, 0xf0, 0x4b, 0xb4, 0xd0, 0x2d, 0xf4, 0x13, 0xce, 0x41, + 0xc2, 0x7b, 0x69, 0x42, 0xee, 0x0c, 0xc9, 0xe6, 0x42, 0x8e, 0xf2, 0xf0, 0x6b, 0x74, 0x03, 0x3e, + 0x9e, 0xe0, 0xab, 0x8d, 0xd2, 0xd3, 0x0a, 0xb5, 0xe1, 0x82, 0x32, 0x5f, 0x59, 0xd9, 0xec, 0x7f, + 0x60, 0x6d, 0x0e, 0x63, 0xf2, 0x7b, 0x4a, 0xbf, 0xd5, 0x72, 0xe6, 0x35, 0xf0, 0x13, 0xe5, 0x36, + 0x5e, 0x55, 0xec, 0x11, 0x6d, 0x9b, 0xee, 0xc0, 0xdd, 0x64, 0x92, 0xb6, 0x4d, 0x77, 0x0a, 0xb4, + 0x6d, 0xba, 0x93, 0xd7, 0xb6, 0x77, 0x0a, 0xb4, 0x2b, 0x70, 0x27, 0x99, 0xac, 0x5d, 0x29, 0xd4, + 0xae, 0x0c, 0x68, 0x57, 0xf0, 0x4f, 0xd1, 0xf5, 0x3c, 0x4f, 0xf9, 0x11, 0xdc, 0x58, 0xe6, 0x2b, + 0x77, 0xc7, 0x49, 0x2b, 0x3f, 0xaa, 0xde, 0x4a, 0x13, 0x72, 0x23, 0xaf, 0xac, 0xfc, 0x28, 0x27, + 0x7c, 0xe4, 0x47, 0xf8, 0x14, 0x2d, 0x19, 0x56, 0xef, 0x33, 0x98, 0xd2, 0xd8, 0xa6, 0xbb, 0xf4, + 0x59, 0xf9, 0x4d, 0x09, 0x1c, 0xd6, 0x47, 0x1d, 0x46, 0xb0, 0xf9, 0xbd, 0x67, 0xa4, 0x68, 0x39, + 0x0b, 0x9a, 0xf6, 0xba, 0xdb, 0xee, 0xd8, 0xbb, 0xcf, 0xf0, 0x1f, 0x4b, 0xe8, 0x5e, 0x91, 0xd8, + 0x13, 0x5a, 0xa1, 0x2c, 0x88, 0x9a, 0xac, 0xfc, 0x77, 0x63, 0xff, 0xe8, 0x3c, 0xfb, 0x1e, 0xa3, + 0x6a, 0xa5, 0x09, 0x59, 0x2d, 0x0a, 0xd1, 0x83, 0x58, 0xce, 0xed, 0xa1, 0x28, 0x4f, 0x2a, 0xcf, + 0x75, 0x01, 0xff, 0xbe, 0x84, 0x56, 0x8a, 0xd5, 0x6d, 0x5a, 0xe7, 0x8a, 0x95, 0xff, 0x61, 0xe2, + 0x6c, 0x9c, 0x1f, 0xc7, 0x10, 0xaa, 0xf7, 0xd3, 0x84, 0xdc, 0x2b, 0x4e, 0x63, 0x10, 0x96, 0xb3, + 0x38, 0x1c, 0xc6, 0xae, 0x72, 0xc5, 0xf0, 0x97, 0xe8, 0x96, 0x51, 0x36, 0xff, 0x3c, 0x50, 0x7a, + 0xba, 0x4d, 0x3f, 0xa6, 0x4f, 0xca, 0x7f, 0xbe, 0x00, 0x11, 0xd6, 0x46, 0x23, 0x0c, 0x02, 0xf3, + 0xc7, 0xfb, 0x60, 0xc5, 0x72, 0xae, 0x69, 0xc2, 0x1e, 0x34, 0xbe, 0xda, 0xfe, 0xf8, 0x49, 0xa1, + 0xd7, 0x53, 0xba, 0x5d, 0xfe, 0xcb, 0x34, 0x5e, 0x4f, 0xe9, 0xf6, 0x18, 0xaf, 0xa7, 0x74, 0x7b, + 0xc8, 0xeb, 0xe9, 0xf6, 0x18, 0x2f, 0xbb, 0xfc, 0xd7, 0xe9, 0xbc, 0xec, 0xb1, 0x5e, 0xf6, 0xb0, + 0x97, 0x8d, 0x7f, 0x89, 0x16, 0x32, 0x09, 0x33, 0xf3, 0xe1, 0x1d, 0x7e, 0x35, 0x03, 0x46, 0xf7, + 0x0a, 0x8c, 0xfa, 0xa8, 0xfc, 0x01, 0x97, 0x6b, 0xb6, 0x9c, 0xab, 0x60, 0xa1, 0x5b, 0xe0, 0x2d, + 0xf5, 0x1c, 0xce, 0x72, 0x0e, 0xff, 0x1f, 0xeb, 0x70, 0x56, 0xec, 0x70, 0x36, 0xe2, 0xf0, 0xba, + 0xe7, 0xf0, 0xa7, 0xd2, 0x54, 0x77, 0xf9, 0xf2, 0x7f, 0x2f, 0x83, 0xe9, 0x56, 0xde, 0x74, 0x0a, + 0x5e, 0x7e, 0xd1, 0xd6, 0xbb, 0x35, 0x2a, 0x4c, 0xd1, 0x72, 0xa6, 0xfa, 0x8c, 0xf8, 0xba, 0x34, + 0xc5, 0x2d, 0xad, 0xfc, 0x3f, 0x13, 0xf0, 0xf1, 0xb4, 0x01, 0x81, 0x95, 0x3f, 0xdb, 0xfa, 0xf1, + 0xf4, 0xcd, 0x46, 0x5a, 0xce, 0xf9, 0xa6, 0xd5, 0x5b, 0x6f, 0xfe, 0xb3, 0xfa, 0xde, 0x9b, 0xb7, + 0xab, 0xa5, 0x7f, 0xbe, 0x5d, 0x2d, 0xfd, 0xfb, 0xed, 0x6a, 0xe9, 0xeb, 0x77, 0xab, 0xef, 0xd5, + 0xdf, 0x87, 0x3f, 0xe3, 0xec, 0x6f, 0x02, 0x00, 0x00, 0xff, 0xff, 0x0d, 0xf3, 0x12, 0x33, 0x86, + 0x14, 0x00, 0x00, } diff --git a/dbtesterpb/config_client_machine.proto b/dbtesterpb/config_client_machine.proto index e38d4854..1f3b6cb2 100644 --- a/dbtesterpb/config_client_machine.proto +++ b/dbtesterpb/config_client_machine.proto @@ -80,9 +80,11 @@ message ConfigClientMachineAgentControl { flag__zookeeper__r3_4_9 flag__zookeeper__r3_4_9 = 200 [(gogoproto.moretags) = "yaml:\"zookeeper__r3_4_9\""]; flag__zookeeper__r3_5_2_alpha flag__zookeeper__r3_5_2_alpha = 201 [(gogoproto.moretags) = "yaml:\"zookeeper__r3_5_2_alpha\""]; + flag__zookeeper__r3_5_3_beta flag__zookeeper__r3_5_3_beta = 202 [(gogoproto.moretags) = "yaml:\"zookeeper__r3_5_3_beta\""]; flag__consul__v0_7_5 flag__consul__v0_7_5 = 300 [(gogoproto.moretags) = "yaml:\"consul__v0_7_5\""]; flag__consul__v0_8_0 flag__consul__v0_8_0 = 301 [(gogoproto.moretags) = "yaml:\"consul__v0_8_0\""]; + flag__consul__v0_8_3 flag__consul__v0_8_3 = 302 [(gogoproto.moretags) = "yaml:\"consul__v0_8_3\""]; flag__cetcd__beta flag__cetcd__beta = 400 [(gogoproto.moretags) = "yaml:\"cetcd__beta\""]; flag__zetcd__beta flag__zetcd__beta = 500 [(gogoproto.moretags) = "yaml:\"zetcd__beta\""]; diff --git a/dbtesterpb/database_id.pb.go b/dbtesterpb/database_id.pb.go index 0e5a2362..6bf65ef7 100644 --- a/dbtesterpb/database_id.pb.go +++ b/dbtesterpb/database_id.pb.go @@ -1,6 +1,5 @@ -// Code generated by protoc-gen-gogo. +// Code generated by protoc-gen-gogo. DO NOT EDIT. // source: dbtesterpb/database_id.proto -// DO NOT EDIT! package dbtesterpb @@ -26,8 +25,10 @@ const ( DatabaseID_etcd__tip DatabaseID = 3 DatabaseID_zookeeper__r3_4_9 DatabaseID = 10 DatabaseID_zookeeper__r3_5_2_alpha DatabaseID = 11 + DatabaseID_zookeeper__r3_5_3_beta DatabaseID = 12 DatabaseID_consul__v0_7_5 DatabaseID = 20 DatabaseID_consul__v0_8_0 DatabaseID = 21 + DatabaseID_consul__v0_8_3 DatabaseID = 22 DatabaseID_zetcd__beta DatabaseID = 30 DatabaseID_cetcd__beta DatabaseID = 40 ) @@ -39,8 +40,10 @@ var DatabaseID_name = map[int32]string{ 3: "etcd__tip", 10: "zookeeper__r3_4_9", 11: "zookeeper__r3_5_2_alpha", + 12: "zookeeper__r3_5_3_beta", 20: "consul__v0_7_5", 21: "consul__v0_8_0", + 22: "consul__v0_8_3", 30: "zetcd__beta", 40: "cetcd__beta", } @@ -51,8 +54,10 @@ var DatabaseID_value = map[string]int32{ "etcd__tip": 3, "zookeeper__r3_4_9": 10, "zookeeper__r3_5_2_alpha": 11, + "zookeeper__r3_5_3_beta": 12, "consul__v0_7_5": 20, "consul__v0_8_0": 21, + "consul__v0_8_3": 22, "zetcd__beta": 30, "cetcd__beta": 40, } @@ -69,21 +74,22 @@ func init() { func init() { proto.RegisterFile("dbtesterpb/database_id.proto", fileDescriptorDatabaseId) } var fileDescriptorDatabaseId = []byte{ - // 245 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x5c, 0x8f, 0xcf, 0x4a, 0xc3, 0x40, - 0x10, 0x87, 0xb3, 0x0a, 0x82, 0x53, 0xac, 0xe3, 0xd2, 0x22, 0xa8, 0xec, 0x59, 0x04, 0x9b, 0x9a, - 0x58, 0xd4, 0xab, 0xf4, 0xe2, 0x53, 0x0c, 0xbb, 0xc9, 0x9a, 0x06, 0xab, 0xbb, 0x24, 0x93, 0x1e, - 0xfa, 0x24, 0x3e, 0x52, 0xbd, 0xf9, 0x08, 0x1a, 0x5f, 0x44, 0xdc, 0x08, 0x36, 0xde, 0xe6, 0xfb, - 0xe6, 0x1f, 0x3f, 0x38, 0xcb, 0x0d, 0xdb, 0x9a, 0x6d, 0xe5, 0x4d, 0x9c, 0x6b, 0xd6, 0x46, 0xd7, - 0x96, 0xca, 0x7c, 0xe2, 0x2b, 0xc7, 0x4e, 0xc2, 0x5f, 0xf7, 0xe4, 0xb2, 0x28, 0x79, 0xd1, 0x98, - 0x49, 0xe6, 0x9e, 0xe3, 0xc2, 0x15, 0x2e, 0x0e, 0x23, 0xa6, 0x79, 0x0c, 0x14, 0x20, 0x54, 0xdd, - 0xea, 0xc5, 0x9b, 0x00, 0x98, 0xff, 0x1e, 0x7c, 0x98, 0xcb, 0x21, 0x80, 0xe5, 0x2c, 0x27, 0x5a, - 0x25, 0x94, 0x62, 0xb4, 0xc5, 0x29, 0x5d, 0xa1, 0xe8, 0x71, 0x82, 0x3b, 0xf2, 0x00, 0xf6, 0x3b, - 0xe6, 0xd2, 0xe3, 0xae, 0x1c, 0xc3, 0xd1, 0xda, 0xb9, 0x27, 0x6b, 0xbd, 0xad, 0x88, 0xaa, 0x94, - 0xae, 0xe9, 0x0e, 0x41, 0x9e, 0xc2, 0x71, 0x5f, 0xcf, 0x28, 0x21, 0xbd, 0xf4, 0x0b, 0x8d, 0x03, - 0x29, 0x61, 0x98, 0xb9, 0x97, 0xba, 0x59, 0x12, 0xad, 0xa6, 0x74, 0x43, 0x33, 0x1c, 0xfd, 0x73, - 0xb7, 0x34, 0xc5, 0xb1, 0x3c, 0x84, 0xc1, 0xba, 0xfb, 0x65, 0x2c, 0x6b, 0x54, 0x3f, 0x22, 0xdb, - 0x12, 0xe7, 0xf7, 0xa3, 0xcd, 0xa7, 0x8a, 0x36, 0xad, 0x12, 0xef, 0xad, 0x12, 0x1f, 0xad, 0x12, - 0xaf, 0x5f, 0x2a, 0x32, 0x7b, 0x21, 0x68, 0xfa, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x89, 0x6f, 0x4c, - 0x96, 0x43, 0x01, 0x00, 0x00, + // 261 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x64, 0x90, 0xc1, 0x4a, 0x03, 0x31, + 0x10, 0x86, 0x37, 0x0a, 0x82, 0x53, 0xad, 0x63, 0x68, 0x2b, 0x54, 0xc9, 0x59, 0x04, 0xbb, 0x75, + 0x63, 0x51, 0xaf, 0xd2, 0x8b, 0x4f, 0x31, 0x24, 0xbb, 0x71, 0xbb, 0x58, 0x4d, 0xd8, 0xcd, 0xf6, + 0xd0, 0x27, 0xf1, 0x91, 0x7a, 0xf4, 0x11, 0x74, 0x7d, 0x0a, 0x6f, 0x62, 0x56, 0xb0, 0xad, 0xb7, + 0x7c, 0xdf, 0x9f, 0xf9, 0x19, 0x06, 0xce, 0x32, 0xed, 0x4d, 0xe5, 0x4d, 0xe9, 0x74, 0x9c, 0x29, + 0xaf, 0xb4, 0xaa, 0x0c, 0x15, 0xd9, 0xc8, 0x95, 0xd6, 0x5b, 0x0e, 0x7f, 0xe9, 0xf0, 0x32, 0x2f, + 0xfc, 0xac, 0xd6, 0xa3, 0xd4, 0x3e, 0xc7, 0xb9, 0xcd, 0x6d, 0x1c, 0xbe, 0xe8, 0xfa, 0x31, 0x50, + 0x80, 0xf0, 0x6a, 0x47, 0x2f, 0xbe, 0x18, 0xc0, 0xf4, 0xb7, 0xf0, 0x61, 0xca, 0xbb, 0x00, 0xc6, + 0xa7, 0x19, 0xd1, 0x22, 0x21, 0x89, 0xd1, 0x1a, 0x4b, 0xba, 0x42, 0xb6, 0xc1, 0x09, 0xee, 0xf0, + 0x43, 0xd8, 0x6f, 0xd9, 0x17, 0x0e, 0x77, 0x79, 0x1f, 0x8e, 0x97, 0xd6, 0x3e, 0x19, 0xe3, 0x4c, + 0x49, 0x54, 0x4a, 0xba, 0xa6, 0x3b, 0x04, 0x7e, 0x0a, 0x27, 0x9b, 0x7a, 0x42, 0x09, 0xa9, 0xb9, + 0x9b, 0x29, 0xec, 0xf0, 0x21, 0x0c, 0xb6, 0x43, 0x49, 0xda, 0x78, 0x85, 0x07, 0x9c, 0x43, 0x37, + 0xb5, 0x2f, 0x55, 0x3d, 0x27, 0x5a, 0x8c, 0xe9, 0x86, 0x26, 0xd8, 0xdb, 0x72, 0xb7, 0x34, 0xc6, + 0xfe, 0x3f, 0x27, 0x71, 0xc0, 0x8f, 0xa0, 0xb3, 0x6c, 0x77, 0x0b, 0x65, 0xe2, 0x47, 0xa4, 0x6b, + 0xe2, 0xfc, 0xbe, 0xb7, 0xfa, 0x10, 0xd1, 0xaa, 0x11, 0xec, 0xad, 0x11, 0xec, 0xbd, 0x11, 0xec, + 0xf5, 0x53, 0x44, 0x7a, 0x2f, 0x1c, 0x46, 0x7e, 0x07, 0x00, 0x00, 0xff, 0xff, 0x2d, 0xf2, 0x67, + 0x53, 0x73, 0x01, 0x00, 0x00, } diff --git a/dbtesterpb/database_id.proto b/dbtesterpb/database_id.proto index 1798586c..78800b1d 100644 --- a/dbtesterpb/database_id.proto +++ b/dbtesterpb/database_id.proto @@ -19,9 +19,11 @@ enum DatabaseID { zookeeper__r3_4_9 = 10; zookeeper__r3_5_2_alpha = 11; + zookeeper__r3_5_3_beta = 12; consul__v0_7_5 = 20; consul__v0_8_0 = 21; + consul__v0_8_3 = 22; zetcd__beta = 30; cetcd__beta = 40; diff --git a/dbtesterpb/flag_cetcd.pb.go b/dbtesterpb/flag_cetcd.pb.go index cd1071c1..89cd3a69 100644 --- a/dbtesterpb/flag_cetcd.pb.go +++ b/dbtesterpb/flag_cetcd.pb.go @@ -1,6 +1,5 @@ -// Code generated by protoc-gen-gogo. +// Code generated by protoc-gen-gogo. DO NOT EDIT. // source: dbtesterpb/flag_cetcd.proto -// DO NOT EDIT! package dbtesterpb diff --git a/dbtesterpb/flag_consul.pb.go b/dbtesterpb/flag_consul.pb.go index 9cda5ffe..069fc799 100644 --- a/dbtesterpb/flag_consul.pb.go +++ b/dbtesterpb/flag_consul.pb.go @@ -1,6 +1,5 @@ -// Code generated by protoc-gen-gogo. +// Code generated by protoc-gen-gogo. DO NOT EDIT. // source: dbtesterpb/flag_consul.proto -// DO NOT EDIT! package dbtesterpb @@ -34,9 +33,19 @@ func (m *Flag_Consul_V0_8_0) String() string { return proto.CompactTe func (*Flag_Consul_V0_8_0) ProtoMessage() {} func (*Flag_Consul_V0_8_0) Descriptor() ([]byte, []int) { return fileDescriptorFlagConsul, []int{1} } +// See https://github.com/hashicorp/consul for more. +type Flag_Consul_V0_8_3 struct { +} + +func (m *Flag_Consul_V0_8_3) Reset() { *m = Flag_Consul_V0_8_3{} } +func (m *Flag_Consul_V0_8_3) String() string { return proto.CompactTextString(m) } +func (*Flag_Consul_V0_8_3) ProtoMessage() {} +func (*Flag_Consul_V0_8_3) Descriptor() ([]byte, []int) { return fileDescriptorFlagConsul, []int{2} } + func init() { proto.RegisterType((*Flag_Consul_V0_7_5)(nil), "dbtesterpb.flag__consul__v0_7_5") proto.RegisterType((*Flag_Consul_V0_8_0)(nil), "dbtesterpb.flag__consul__v0_8_0") + proto.RegisterType((*Flag_Consul_V0_8_3)(nil), "dbtesterpb.flag__consul__v0_8_3") } func (m *Flag_Consul_V0_7_5) Marshal() (dAtA []byte, err error) { size := m.Size() @@ -74,6 +83,24 @@ func (m *Flag_Consul_V0_8_0) MarshalTo(dAtA []byte) (int, error) { return i, nil } +func (m *Flag_Consul_V0_8_3) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Flag_Consul_V0_8_3) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + return i, nil +} + func encodeFixed64FlagConsul(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) dAtA[offset+1] = uint8(v >> 8) @@ -113,6 +140,12 @@ func (m *Flag_Consul_V0_8_0) Size() (n int) { return n } +func (m *Flag_Consul_V0_8_3) Size() (n int) { + var l int + _ = l + return n +} + func sovFlagConsul(x uint64) (n int) { for { n++ @@ -226,6 +259,56 @@ func (m *Flag_Consul_V0_8_0) Unmarshal(dAtA []byte) error { } return nil } +func (m *Flag_Consul_V0_8_3) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFlagConsul + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: flag__consul__v0_8_3: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: flag__consul__v0_8_3: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + default: + iNdEx = preIndex + skippy, err := skipFlagConsul(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthFlagConsul + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipFlagConsul(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 @@ -334,14 +417,14 @@ var ( func init() { proto.RegisterFile("dbtesterpb/flag_consul.proto", fileDescriptorFlagConsul) } var fileDescriptorFlagConsul = []byte{ - // 138 bytes of a gzipped FileDescriptorProto + // 141 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xe2, 0x92, 0x49, 0x49, 0x2a, 0x49, 0x2d, 0x2e, 0x49, 0x2d, 0x2a, 0x48, 0xd2, 0x4f, 0xcb, 0x49, 0x4c, 0x8f, 0x4f, 0xce, 0xcf, 0x2b, 0x2e, 0xcd, 0xd1, 0x2b, 0x28, 0xca, 0x2f, 0xc9, 0x17, 0xe2, 0x42, 0xc8, 0x4a, 0xe9, 0xa6, 0x67, 0x96, 0x64, 0x94, 0x26, 0xe9, 0x25, 0xe7, 0xe7, 0xea, 0xa7, 0xe7, 0xa7, 0xe7, 0xeb, 0x83, 0x95, 0x24, 0x95, 0xa6, 0x81, 0x79, 0x60, 0x0e, 0x98, 0x05, 0xd1, 0xaa, 0x24, 0xc6, 0x25, 0x02, 0x36, 0x0f, 0x6a, 0x60, 0x7c, 0x7c, 0x99, 0x41, 0xbc, 0x79, 0xbc, 0x29, 0x56, 0x71, 0x8b, 0x78, 0x03, - 0x27, 0x91, 0x13, 0x0f, 0xe5, 0x18, 0x4e, 0x3c, 0x92, 0x63, 0xbc, 0xf0, 0x48, 0x8e, 0xf1, 0xc1, - 0x23, 0x39, 0xc6, 0x19, 0x8f, 0xe5, 0x18, 0x92, 0xd8, 0xc0, 0x86, 0x19, 0x03, 0x02, 0x00, 0x00, - 0xff, 0xff, 0x93, 0xd4, 0x88, 0x26, 0xa7, 0x00, 0x00, 0x00, + 0x1c, 0xe2, 0xc6, 0x4e, 0x22, 0x27, 0x1e, 0xca, 0x31, 0x9c, 0x78, 0x24, 0xc7, 0x78, 0xe1, 0x91, + 0x1c, 0xe3, 0x83, 0x47, 0x72, 0x8c, 0x33, 0x1e, 0xcb, 0x31, 0x24, 0xb1, 0x81, 0x2d, 0x31, 0x06, + 0x04, 0x00, 0x00, 0xff, 0xff, 0x06, 0x4b, 0x2e, 0x7f, 0xbf, 0x00, 0x00, 0x00, } diff --git a/dbtesterpb/flag_consul.proto b/dbtesterpb/flag_consul.proto index 2c07e6c1..3f3d1e0f 100644 --- a/dbtesterpb/flag_consul.proto +++ b/dbtesterpb/flag_consul.proto @@ -15,3 +15,7 @@ message flag__consul__v0_7_5 { // See https://github.com/hashicorp/consul for more. message flag__consul__v0_8_0 { } + +// See https://github.com/hashicorp/consul for more. +message flag__consul__v0_8_3 { +} diff --git a/dbtesterpb/flag_etcd.pb.go b/dbtesterpb/flag_etcd.pb.go index 10592b35..3252e242 100644 --- a/dbtesterpb/flag_etcd.pb.go +++ b/dbtesterpb/flag_etcd.pb.go @@ -1,6 +1,5 @@ -// Code generated by protoc-gen-gogo. +// Code generated by protoc-gen-gogo. DO NOT EDIT. // source: dbtesterpb/flag_etcd.proto -// DO NOT EDIT! package dbtesterpb diff --git a/dbtesterpb/flag_zetcd.pb.go b/dbtesterpb/flag_zetcd.pb.go index 736482b6..c7aca843 100644 --- a/dbtesterpb/flag_zetcd.pb.go +++ b/dbtesterpb/flag_zetcd.pb.go @@ -1,6 +1,5 @@ -// Code generated by protoc-gen-gogo. +// Code generated by protoc-gen-gogo. DO NOT EDIT. // source: dbtesterpb/flag_zetcd.proto -// DO NOT EDIT! package dbtesterpb diff --git a/dbtesterpb/flag_zookeeper.pb.go b/dbtesterpb/flag_zookeeper.pb.go index 027cde8f..25510b67 100644 --- a/dbtesterpb/flag_zookeeper.pb.go +++ b/dbtesterpb/flag_zookeeper.pb.go @@ -1,6 +1,5 @@ -// Code generated by protoc-gen-gogo. +// Code generated by protoc-gen-gogo. DO NOT EDIT. // source: dbtesterpb/flag_zookeeper.proto -// DO NOT EDIT! package dbtesterpb @@ -84,9 +83,44 @@ func (*Flag_Zookeeper_R3_5_2Alpha) Descriptor() ([]byte, []int) { return fileDescriptorFlagZookeeper, []int{1} } +type Flag_Zookeeper_R3_5_3Beta struct { + // JavaDJuteMaxBuffer is for '-Djute.maxbuffer' flag. + // It is the maximum size, in bytes, of a request or response. + // See http://zookeeper.apache.org/doc/trunk/zookeeperAdmin.html#Unsafe+Options for more. + JavaDJuteMaxBuffer uint64 `protobuf:"varint,1,opt,name=JavaDJuteMaxBuffer,proto3" json:"JavaDJuteMaxBuffer,omitempty" yaml:"java_d_jute_max_buffer"` + // JavaXms is for '-Xms' flag (minimum Java heap size). + // See https://docs.oracle.com/cd/E13150_01/jrockit_jvm/jrockit/jrdocs/refman/optionX.html for more. + JavaXms string `protobuf:"bytes,2,opt,name=JavaXms,proto3" json:"JavaXms,omitempty" yaml:"java_xms"` + // JavaXmx is for '-Xmx' flag (maximum Java heap size). + // See https://docs.oracle.com/cd/E13150_01/jrockit_jvm/jrockit/jrdocs/refman/optionX.html for more. + JavaXmx string `protobuf:"bytes,3,opt,name=JavaXmx,proto3" json:"JavaXmx,omitempty" yaml:"java_xmx"` + // MyID contains a single integer in human readable ASCII text that represents the server id. + // Each ZooKeeper server has a unique id. This id is used in two places: the myid file and the + // configuration file. The myid file identifies the server that corresponds to the given data directory. + // See http://zookeeper.apache.org/doc/trunk/zookeeperAdmin.html#sc_dataFileManagement for more. + MyID uint32 `protobuf:"varint,100,opt,name=MyID,proto3" json:"MyID,omitempty"` + // ClientPort is by default '2181'. + // No need to set manually. Inherited from 'database_port_to_connect'. + ClientPort int64 `protobuf:"varint,101,opt,name=ClientPort,proto3" json:"ClientPort,omitempty"` + // See http://zookeeper.apache.org/doc/trunk/zookeeperAdmin.html for more. + TickTime int64 `protobuf:"varint,102,opt,name=TickTime,proto3" json:"TickTime,omitempty" yaml:"tick_time"` + InitLimit int64 `protobuf:"varint,103,opt,name=InitLimit,proto3" json:"InitLimit,omitempty" yaml:"init_limit"` + SyncLimit int64 `protobuf:"varint,104,opt,name=SyncLimit,proto3" json:"SyncLimit,omitempty" yaml:"sync_limit"` + SnapCount int64 `protobuf:"varint,105,opt,name=SnapCount,proto3" json:"SnapCount,omitempty" yaml:"snap_count"` + MaxClientConnections int64 `protobuf:"varint,106,opt,name=MaxClientConnections,proto3" json:"MaxClientConnections,omitempty" yaml:"max_client_connections"` +} + +func (m *Flag_Zookeeper_R3_5_3Beta) Reset() { *m = Flag_Zookeeper_R3_5_3Beta{} } +func (m *Flag_Zookeeper_R3_5_3Beta) String() string { return proto.CompactTextString(m) } +func (*Flag_Zookeeper_R3_5_3Beta) ProtoMessage() {} +func (*Flag_Zookeeper_R3_5_3Beta) Descriptor() ([]byte, []int) { + return fileDescriptorFlagZookeeper, []int{2} +} + func init() { proto.RegisterType((*Flag_Zookeeper_R3_4_9)(nil), "dbtesterpb.flag__zookeeper__r3_4_9") proto.RegisterType((*Flag_Zookeeper_R3_5_2Alpha)(nil), "dbtesterpb.flag__zookeeper__r3_5_2_alpha") + proto.RegisterType((*Flag_Zookeeper_R3_5_3Beta)(nil), "dbtesterpb.flag__zookeeper__r3_5_3_beta") } func (m *Flag_Zookeeper_R3_4_9) Marshal() (dAtA []byte, err error) { size := m.Size() @@ -256,6 +290,90 @@ func (m *Flag_Zookeeper_R3_5_2Alpha) MarshalTo(dAtA []byte) (int, error) { return i, nil } +func (m *Flag_Zookeeper_R3_5_3Beta) Marshal() (dAtA []byte, err error) { + size := m.Size() + dAtA = make([]byte, size) + n, err := m.MarshalTo(dAtA) + if err != nil { + return nil, err + } + return dAtA[:n], nil +} + +func (m *Flag_Zookeeper_R3_5_3Beta) MarshalTo(dAtA []byte) (int, error) { + var i int + _ = i + var l int + _ = l + if m.JavaDJuteMaxBuffer != 0 { + dAtA[i] = 0x8 + i++ + i = encodeVarintFlagZookeeper(dAtA, i, uint64(m.JavaDJuteMaxBuffer)) + } + if len(m.JavaXms) > 0 { + dAtA[i] = 0x12 + i++ + i = encodeVarintFlagZookeeper(dAtA, i, uint64(len(m.JavaXms))) + i += copy(dAtA[i:], m.JavaXms) + } + if len(m.JavaXmx) > 0 { + dAtA[i] = 0x1a + i++ + i = encodeVarintFlagZookeeper(dAtA, i, uint64(len(m.JavaXmx))) + i += copy(dAtA[i:], m.JavaXmx) + } + if m.MyID != 0 { + dAtA[i] = 0xa0 + i++ + dAtA[i] = 0x6 + i++ + i = encodeVarintFlagZookeeper(dAtA, i, uint64(m.MyID)) + } + if m.ClientPort != 0 { + dAtA[i] = 0xa8 + i++ + dAtA[i] = 0x6 + i++ + i = encodeVarintFlagZookeeper(dAtA, i, uint64(m.ClientPort)) + } + if m.TickTime != 0 { + dAtA[i] = 0xb0 + i++ + dAtA[i] = 0x6 + i++ + i = encodeVarintFlagZookeeper(dAtA, i, uint64(m.TickTime)) + } + if m.InitLimit != 0 { + dAtA[i] = 0xb8 + i++ + dAtA[i] = 0x6 + i++ + i = encodeVarintFlagZookeeper(dAtA, i, uint64(m.InitLimit)) + } + if m.SyncLimit != 0 { + dAtA[i] = 0xc0 + i++ + dAtA[i] = 0x6 + i++ + i = encodeVarintFlagZookeeper(dAtA, i, uint64(m.SyncLimit)) + } + if m.SnapCount != 0 { + dAtA[i] = 0xc8 + i++ + dAtA[i] = 0x6 + i++ + i = encodeVarintFlagZookeeper(dAtA, i, uint64(m.SnapCount)) + } + if m.MaxClientConnections != 0 { + dAtA[i] = 0xd0 + i++ + dAtA[i] = 0x6 + i++ + i = encodeVarintFlagZookeeper(dAtA, i, uint64(m.MaxClientConnections)) + } + return i, nil +} + func encodeFixed64FlagZookeeper(dAtA []byte, offset int, v uint64) int { dAtA[offset] = uint8(v) dAtA[offset+1] = uint8(v >> 8) @@ -359,6 +477,44 @@ func (m *Flag_Zookeeper_R3_5_2Alpha) Size() (n int) { return n } +func (m *Flag_Zookeeper_R3_5_3Beta) Size() (n int) { + var l int + _ = l + if m.JavaDJuteMaxBuffer != 0 { + n += 1 + sovFlagZookeeper(uint64(m.JavaDJuteMaxBuffer)) + } + l = len(m.JavaXms) + if l > 0 { + n += 1 + l + sovFlagZookeeper(uint64(l)) + } + l = len(m.JavaXmx) + if l > 0 { + n += 1 + l + sovFlagZookeeper(uint64(l)) + } + if m.MyID != 0 { + n += 2 + sovFlagZookeeper(uint64(m.MyID)) + } + if m.ClientPort != 0 { + n += 2 + sovFlagZookeeper(uint64(m.ClientPort)) + } + if m.TickTime != 0 { + n += 2 + sovFlagZookeeper(uint64(m.TickTime)) + } + if m.InitLimit != 0 { + n += 2 + sovFlagZookeeper(uint64(m.InitLimit)) + } + if m.SyncLimit != 0 { + n += 2 + sovFlagZookeeper(uint64(m.SyncLimit)) + } + if m.SnapCount != 0 { + n += 2 + sovFlagZookeeper(uint64(m.SnapCount)) + } + if m.MaxClientConnections != 0 { + n += 2 + sovFlagZookeeper(uint64(m.MaxClientConnections)) + } + return n +} + func sovFlagZookeeper(x uint64) (n int) { for { n++ @@ -892,6 +1048,266 @@ func (m *Flag_Zookeeper_R3_5_2Alpha) Unmarshal(dAtA []byte) error { } return nil } +func (m *Flag_Zookeeper_R3_5_3Beta) Unmarshal(dAtA []byte) error { + l := len(dAtA) + iNdEx := 0 + for iNdEx < l { + preIndex := iNdEx + var wire uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFlagZookeeper + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + wire |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + fieldNum := int32(wire >> 3) + wireType := int(wire & 0x7) + if wireType == 4 { + return fmt.Errorf("proto: flag__zookeeper__r3_5_3_beta: wiretype end group for non-group") + } + if fieldNum <= 0 { + return fmt.Errorf("proto: flag__zookeeper__r3_5_3_beta: illegal tag %d (wire type %d)", fieldNum, wire) + } + switch fieldNum { + case 1: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field JavaDJuteMaxBuffer", wireType) + } + m.JavaDJuteMaxBuffer = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFlagZookeeper + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.JavaDJuteMaxBuffer |= (uint64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + case 2: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field JavaXms", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFlagZookeeper + } + 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 ErrInvalidLengthFlagZookeeper + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.JavaXms = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 3: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field JavaXmx", wireType) + } + var stringLen uint64 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFlagZookeeper + } + 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 ErrInvalidLengthFlagZookeeper + } + postIndex := iNdEx + intStringLen + if postIndex > l { + return io.ErrUnexpectedEOF + } + m.JavaXmx = string(dAtA[iNdEx:postIndex]) + iNdEx = postIndex + case 100: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field MyID", wireType) + } + m.MyID = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFlagZookeeper + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.MyID |= (uint32(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + case 101: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field ClientPort", wireType) + } + m.ClientPort = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFlagZookeeper + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.ClientPort |= (int64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + case 102: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field TickTime", wireType) + } + m.TickTime = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFlagZookeeper + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.TickTime |= (int64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + case 103: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field InitLimit", wireType) + } + m.InitLimit = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFlagZookeeper + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.InitLimit |= (int64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + case 104: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field SyncLimit", wireType) + } + m.SyncLimit = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFlagZookeeper + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.SyncLimit |= (int64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + case 105: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field SnapCount", wireType) + } + m.SnapCount = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFlagZookeeper + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.SnapCount |= (int64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + case 106: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field MaxClientConnections", wireType) + } + m.MaxClientConnections = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowFlagZookeeper + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.MaxClientConnections |= (int64(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + default: + iNdEx = preIndex + skippy, err := skipFlagZookeeper(dAtA[iNdEx:]) + if err != nil { + return err + } + if skippy < 0 { + return ErrInvalidLengthFlagZookeeper + } + if (iNdEx + skippy) > l { + return io.ErrUnexpectedEOF + } + iNdEx += skippy + } + } + + if iNdEx > l { + return io.ErrUnexpectedEOF + } + return nil +} func skipFlagZookeeper(dAtA []byte) (n int, err error) { l := len(dAtA) iNdEx := 0 @@ -1000,33 +1416,34 @@ var ( func init() { proto.RegisterFile("dbtesterpb/flag_zookeeper.proto", fileDescriptorFlagZookeeper) } var fileDescriptorFlagZookeeper = []byte{ - // 442 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x94, 0xcf, 0x6e, 0xd3, 0x30, - 0x18, 0xc0, 0x17, 0x56, 0x01, 0xb3, 0x84, 0x00, 0x53, 0x84, 0x85, 0xb4, 0xa4, 0xf8, 0xd4, 0xcb, - 0x56, 0x44, 0xe1, 0x00, 0xc7, 0x74, 0x97, 0x4d, 0x54, 0x82, 0x30, 0x24, 0x6e, 0x96, 0xe3, 0x3a, - 0xa9, 0xdb, 0xd8, 0x8e, 0x12, 0x67, 0x4a, 0x79, 0x12, 0x9e, 0x80, 0x13, 0x0f, 0xb2, 0x23, 0x4f, - 0x50, 0x41, 0x79, 0x83, 0x3c, 0x01, 0x8a, 0xa3, 0x25, 0x15, 0x74, 0x6f, 0xd0, 0xdb, 0xf7, 0xe7, - 0xf7, 0xfb, 0xa2, 0xe8, 0xfb, 0x64, 0xe0, 0xcd, 0x42, 0xc3, 0x73, 0xc3, 0xb3, 0x34, 0x1c, 0x45, - 0x09, 0x8d, 0xc9, 0x57, 0xad, 0x97, 0x9c, 0xa7, 0x3c, 0x3b, 0x4d, 0x33, 0x6d, 0x34, 0x04, 0x1d, - 0xf0, 0xfc, 0x24, 0x16, 0x66, 0x5e, 0x84, 0xa7, 0x4c, 0xcb, 0x51, 0xac, 0x63, 0x3d, 0xb2, 0x48, - 0x58, 0x44, 0x36, 0xb3, 0x89, 0x8d, 0x1a, 0x15, 0x7f, 0xef, 0x81, 0x67, 0x76, 0x66, 0x37, 0x94, - 0x90, 0x6c, 0x4c, 0x5e, 0x93, 0xb7, 0xf0, 0x23, 0x80, 0x17, 0xf4, 0x8a, 0x9e, 0x5d, 0x14, 0x86, - 0x4f, 0x69, 0xe9, 0x17, 0x51, 0xc4, 0x33, 0xe4, 0x0c, 0x9c, 0x61, 0xcf, 0x7f, 0x51, 0xad, 0xbd, - 0xe3, 0x15, 0x95, 0xc9, 0x3b, 0xbc, 0xa0, 0x57, 0x94, 0xcc, 0xc8, 0xa2, 0x30, 0x9c, 0x48, 0x5a, - 0x92, 0xd0, 0x72, 0x38, 0xd8, 0x21, 0xc3, 0x13, 0x70, 0xaf, 0xae, 0x7e, 0x91, 0x39, 0xba, 0x33, - 0x70, 0x86, 0x47, 0xfe, 0x93, 0x6a, 0xed, 0x3d, 0xdc, 0x9a, 0x53, 0xca, 0x1c, 0x07, 0x37, 0x4c, - 0x87, 0x97, 0xe8, 0xf0, 0x16, 0xbc, 0x6c, 0xf1, 0x12, 0x42, 0xd0, 0x9b, 0xae, 0xce, 0xcf, 0xd0, - 0x6c, 0xe0, 0x0c, 0x1f, 0x04, 0x36, 0x86, 0x2e, 0x00, 0x93, 0x44, 0x70, 0x65, 0x3e, 0xe8, 0xcc, - 0x20, 0x3e, 0x70, 0x86, 0x87, 0xc1, 0x56, 0x05, 0xbe, 0x04, 0xf7, 0x2f, 0x05, 0x5b, 0x5e, 0x0a, - 0xc9, 0x51, 0x54, 0x77, 0xfd, 0x7e, 0xb5, 0xf6, 0x1e, 0x35, 0xdf, 0x30, 0x82, 0x2d, 0x89, 0x11, - 0x92, 0xe3, 0xa0, 0xa5, 0xe0, 0x18, 0x1c, 0x9d, 0x2b, 0x61, 0xde, 0x0b, 0x29, 0x0c, 0x8a, 0xad, - 0xf2, 0xb4, 0x5a, 0x7b, 0x8f, 0x1b, 0x45, 0x28, 0x61, 0x48, 0x52, 0xf7, 0x70, 0xd0, 0x71, 0xb5, - 0xf4, 0x69, 0xa5, 0x58, 0x23, 0xcd, 0xff, 0x95, 0xf2, 0x95, 0x62, 0xad, 0xd4, 0x72, 0x56, 0x52, - 0x34, 0x9d, 0xe8, 0x42, 0x19, 0x24, 0xfe, 0x93, 0x14, 0x4d, 0x09, 0xab, 0x7b, 0xb5, 0x74, 0xc3, - 0xc1, 0xcf, 0xa0, 0x3f, 0xa5, 0x65, 0xf3, 0x87, 0x13, 0xad, 0x14, 0x67, 0x46, 0x68, 0x95, 0xa3, - 0x85, 0xf5, 0xb7, 0xf6, 0x56, 0xef, 0x8a, 0x59, 0x8c, 0xb0, 0x8e, 0xc3, 0xc1, 0x4e, 0x1d, 0xff, - 0xe8, 0x81, 0xe3, 0x5d, 0x87, 0xf2, 0x86, 0xbc, 0x22, 0x34, 0x49, 0xe7, 0x74, 0x7f, 0x2e, 0xfb, - 0x73, 0x69, 0xcb, 0x7e, 0xff, 0xfa, 0xb7, 0x7b, 0x70, 0xbd, 0x71, 0x9d, 0x9f, 0x1b, 0xd7, 0xf9, - 0xb5, 0x71, 0x9d, 0x6f, 0x7f, 0xdc, 0x83, 0xf0, 0xae, 0x7d, 0x74, 0xc6, 0x7f, 0x03, 0x00, 0x00, - 0xff, 0xff, 0x29, 0x97, 0xdc, 0xa7, 0xd2, 0x04, 0x00, 0x00, + // 459 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xec, 0x95, 0x41, 0x8e, 0xd3, 0x30, + 0x14, 0x86, 0x27, 0x4c, 0x04, 0x8c, 0x25, 0x04, 0x98, 0x22, 0x2c, 0xc4, 0x24, 0x25, 0xab, 0x6e, + 0x66, 0x8a, 0x28, 0x2c, 0x60, 0x99, 0xce, 0x66, 0x46, 0x54, 0x82, 0x30, 0x48, 0xec, 0x2c, 0xc7, + 0x75, 0x52, 0xb7, 0x89, 0x1d, 0x25, 0x2f, 0xa3, 0x94, 0x93, 0x70, 0x02, 0x36, 0x70, 0x90, 0x59, + 0x72, 0x82, 0x0a, 0xca, 0x0d, 0x7a, 0x02, 0x14, 0x47, 0x6d, 0x2a, 0xe8, 0xdc, 0xa0, 0x3b, 0xfb, + 0xbd, 0xef, 0x7b, 0x51, 0xf4, 0x7e, 0xc9, 0xc8, 0x1d, 0x87, 0x20, 0x0a, 0x10, 0x79, 0x16, 0xf6, + 0xa3, 0x84, 0xc5, 0xf4, 0x8b, 0xd6, 0x33, 0x21, 0x32, 0x91, 0x9f, 0x66, 0xb9, 0x06, 0x8d, 0x51, + 0x0b, 0x3c, 0x3d, 0x89, 0x25, 0x4c, 0xca, 0xf0, 0x94, 0xeb, 0xb4, 0x1f, 0xeb, 0x58, 0xf7, 0x0d, + 0x12, 0x96, 0x91, 0xb9, 0x99, 0x8b, 0x39, 0x35, 0xaa, 0xf7, 0xcd, 0x46, 0x4f, 0xcc, 0xcc, 0x76, + 0x28, 0xa5, 0xf9, 0x80, 0xbe, 0xa2, 0x6f, 0xf0, 0x07, 0x84, 0x2f, 0xd8, 0x15, 0x3b, 0xbb, 0x28, + 0x41, 0x8c, 0x58, 0xe5, 0x97, 0x51, 0x24, 0x72, 0x62, 0x75, 0xad, 0x9e, 0xed, 0x3f, 0x5f, 0x2d, + 0xdc, 0xe3, 0x39, 0x4b, 0x93, 0xb7, 0xde, 0x94, 0x5d, 0x31, 0x3a, 0xa6, 0xd3, 0x12, 0x04, 0x4d, + 0x59, 0x45, 0x43, 0xc3, 0x79, 0xc1, 0x0e, 0x19, 0x9f, 0xa0, 0x3b, 0x75, 0xf5, 0x73, 0x5a, 0x90, + 0x5b, 0x5d, 0xab, 0x77, 0xe4, 0x3f, 0x5a, 0x2d, 0xdc, 0xfb, 0x5b, 0x73, 0xaa, 0xb4, 0xf0, 0x82, + 0x35, 0xd3, 0xe2, 0x15, 0x39, 0xbc, 0x01, 0xaf, 0x36, 0x78, 0x85, 0x31, 0xb2, 0x47, 0xf3, 0xf3, + 0x33, 0x32, 0xee, 0x5a, 0xbd, 0x7b, 0x81, 0x39, 0x63, 0x07, 0xa1, 0x61, 0x22, 0x85, 0x82, 0xf7, + 0x3a, 0x07, 0x22, 0xba, 0x56, 0xef, 0x30, 0xd8, 0xaa, 0xe0, 0x17, 0xe8, 0xee, 0xa5, 0xe4, 0xb3, + 0x4b, 0x99, 0x0a, 0x12, 0xd5, 0x5d, 0xbf, 0xb3, 0x5a, 0xb8, 0x0f, 0x9a, 0x6f, 0x80, 0xe4, 0x33, + 0x0a, 0x32, 0x15, 0x5e, 0xb0, 0xa1, 0xf0, 0x00, 0x1d, 0x9d, 0x2b, 0x09, 0xef, 0x64, 0x2a, 0x81, + 0xc4, 0x46, 0x79, 0xbc, 0x5a, 0xb8, 0x0f, 0x1b, 0x45, 0x2a, 0x09, 0x34, 0xa9, 0x7b, 0x5e, 0xd0, + 0x72, 0xb5, 0xf4, 0x71, 0xae, 0x78, 0x23, 0x4d, 0xfe, 0x95, 0x8a, 0xb9, 0xe2, 0x1b, 0x69, 0xc3, + 0x19, 0x49, 0xb1, 0x6c, 0xa8, 0x4b, 0x05, 0x44, 0xfe, 0x27, 0x29, 0x96, 0x51, 0x5e, 0xf7, 0x6a, + 0x69, 0xcd, 0xe1, 0x4f, 0xa8, 0x33, 0x62, 0x55, 0xf3, 0x87, 0x43, 0xad, 0x94, 0xe0, 0x20, 0xb5, + 0x2a, 0xc8, 0xd4, 0xf8, 0x5b, 0x7b, 0xab, 0x77, 0xc5, 0x0d, 0x46, 0x79, 0xcb, 0x79, 0xc1, 0x4e, + 0xdd, 0xfb, 0x61, 0xa3, 0xe3, 0x5d, 0x41, 0x79, 0x4d, 0x5f, 0x52, 0x96, 0x64, 0x13, 0xb6, 0x8f, + 0xcb, 0x3e, 0x2e, 0x6d, 0xf9, 0xbb, 0x8d, 0x9e, 0xed, 0x8e, 0xcb, 0x80, 0x86, 0x02, 0xf6, 0x69, + 0xd9, 0xa7, 0xa5, 0x2d, 0xfb, 0x9d, 0xeb, 0xdf, 0xce, 0xc1, 0xf5, 0xd2, 0xb1, 0x7e, 0x2e, 0x1d, + 0xeb, 0xd7, 0xd2, 0xb1, 0xbe, 0xfe, 0x71, 0x0e, 0xc2, 0xdb, 0xe6, 0x89, 0x1a, 0xfc, 0x0d, 0x00, + 0x00, 0xff, 0xff, 0xff, 0x80, 0x50, 0x7f, 0x00, 0x07, 0x00, 0x00, } diff --git a/dbtesterpb/flag_zookeeper.proto b/dbtesterpb/flag_zookeeper.proto index 42e65b79..4e43b754 100644 --- a/dbtesterpb/flag_zookeeper.proto +++ b/dbtesterpb/flag_zookeeper.proto @@ -71,3 +71,35 @@ message flag__zookeeper__r3_5_2_alpha { int64 SnapCount = 105 [(gogoproto.moretags) = "yaml:\"snap_count\""]; int64 MaxClientConnections = 106 [(gogoproto.moretags) = "yaml:\"max_client_connections\""]; } + +message flag__zookeeper__r3_5_3_beta { + // JavaDJuteMaxBuffer is for '-Djute.maxbuffer' flag. + // It is the maximum size, in bytes, of a request or response. + // See http://zookeeper.apache.org/doc/trunk/zookeeperAdmin.html#Unsafe+Options for more. + uint64 JavaDJuteMaxBuffer = 1 [(gogoproto.moretags) = "yaml:\"java_d_jute_max_buffer\""]; + + // JavaXms is for '-Xms' flag (minimum Java heap size). + // See https://docs.oracle.com/cd/E13150_01/jrockit_jvm/jrockit/jrdocs/refman/optionX.html for more. + string JavaXms = 2 [(gogoproto.moretags) = "yaml:\"java_xms\""]; + + // JavaXmx is for '-Xmx' flag (maximum Java heap size). + // See https://docs.oracle.com/cd/E13150_01/jrockit_jvm/jrockit/jrdocs/refman/optionX.html for more. + string JavaXmx = 3 [(gogoproto.moretags) = "yaml:\"java_xmx\""]; + + // MyID contains a single integer in human readable ASCII text that represents the server id. + // Each ZooKeeper server has a unique id. This id is used in two places: the myid file and the + // configuration file. The myid file identifies the server that corresponds to the given data directory. + // See http://zookeeper.apache.org/doc/trunk/zookeeperAdmin.html#sc_dataFileManagement for more. + uint32 MyID = 100; + + // ClientPort is by default '2181'. + // No need to set manually. Inherited from 'database_port_to_connect'. + int64 ClientPort = 101; + + // See http://zookeeper.apache.org/doc/trunk/zookeeperAdmin.html for more. + int64 TickTime = 102 [(gogoproto.moretags) = "yaml:\"tick_time\""]; + int64 InitLimit = 103 [(gogoproto.moretags) = "yaml:\"init_limit\""]; + int64 SyncLimit = 104 [(gogoproto.moretags) = "yaml:\"sync_limit\""]; + int64 SnapCount = 105 [(gogoproto.moretags) = "yaml:\"snap_count\""]; + int64 MaxClientConnections = 106 [(gogoproto.moretags) = "yaml:\"max_client_connections\""]; +} diff --git a/dbtesterpb/message.pb.go b/dbtesterpb/message.pb.go index 0edd293a..6236fbc0 100644 --- a/dbtesterpb/message.pb.go +++ b/dbtesterpb/message.pb.go @@ -1,6 +1,5 @@ -// Code generated by protoc-gen-gogo. +// Code generated by protoc-gen-gogo. DO NOT EDIT. // source: dbtesterpb/message.proto -// DO NOT EDIT! package dbtesterpb @@ -63,8 +62,10 @@ type Request struct { Flag_Etcd_Tip *Flag_Etcd_Tip `protobuf:"bytes,103,opt,name=flag__etcd__tip,json=flagEtcdTip" json:"flag__etcd__tip,omitempty"` Flag_Zookeeper_R3_4_9 *Flag_Zookeeper_R3_4_9 `protobuf:"bytes,200,opt,name=flag__zookeeper__r3_4_9,json=flagZookeeperR349" json:"flag__zookeeper__r3_4_9,omitempty"` Flag_Zookeeper_R3_5_2Alpha *Flag_Zookeeper_R3_5_2Alpha `protobuf:"bytes,201,opt,name=flag__zookeeper__r3_5_2_alpha,json=flagZookeeperR352Alpha" json:"flag__zookeeper__r3_5_2_alpha,omitempty"` + Flag_Zookeeper_R3_5_3Beta *Flag_Zookeeper_R3_5_3Beta `protobuf:"bytes,202,opt,name=flag__zookeeper__r3_5_3_beta,json=flagZookeeperR353Beta" json:"flag__zookeeper__r3_5_3_beta,omitempty"` Flag_Consul_V0_7_5 *Flag_Consul_V0_7_5 `protobuf:"bytes,300,opt,name=flag__consul__v0_7_5,json=flagConsulV075" json:"flag__consul__v0_7_5,omitempty"` Flag_Consul_V0_8_0 *Flag_Consul_V0_8_0 `protobuf:"bytes,301,opt,name=flag__consul__v0_8_0,json=flagConsulV080" json:"flag__consul__v0_8_0,omitempty"` + Flag_Consul_V0_8_3 *Flag_Consul_V0_8_3 `protobuf:"bytes,302,opt,name=flag__consul__v0_8_3,json=flagConsulV083" json:"flag__consul__v0_8_3,omitempty"` Flag_Cetcd_Beta *Flag_Cetcd_Beta `protobuf:"bytes,400,opt,name=flag__cetcd__beta,json=flagCetcdBeta" json:"flag__cetcd__beta,omitempty"` Flag_Zetcd_Beta *Flag_Zetcd_Beta `protobuf:"bytes,500,opt,name=flag__zetcd__beta,json=flagZetcdBeta" json:"flag__zetcd__beta,omitempty"` } @@ -303,17 +304,29 @@ func (m *Request) MarshalTo(dAtA []byte) (int, error) { } i += n7 } + if m.Flag_Zookeeper_R3_5_3Beta != nil { + dAtA[i] = 0xd2 + i++ + dAtA[i] = 0xc + i++ + i = encodeVarintMessage(dAtA, i, uint64(m.Flag_Zookeeper_R3_5_3Beta.Size())) + n8, err := m.Flag_Zookeeper_R3_5_3Beta.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n8 + } if m.Flag_Consul_V0_7_5 != nil { dAtA[i] = 0xe2 i++ dAtA[i] = 0x12 i++ i = encodeVarintMessage(dAtA, i, uint64(m.Flag_Consul_V0_7_5.Size())) - n8, err := m.Flag_Consul_V0_7_5.MarshalTo(dAtA[i:]) + n9, err := m.Flag_Consul_V0_7_5.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n8 + i += n9 } if m.Flag_Consul_V0_8_0 != nil { dAtA[i] = 0xea @@ -321,11 +334,23 @@ func (m *Request) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x12 i++ i = encodeVarintMessage(dAtA, i, uint64(m.Flag_Consul_V0_8_0.Size())) - n9, err := m.Flag_Consul_V0_8_0.MarshalTo(dAtA[i:]) + n10, err := m.Flag_Consul_V0_8_0.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n9 + i += n10 + } + if m.Flag_Consul_V0_8_3 != nil { + dAtA[i] = 0xf2 + i++ + dAtA[i] = 0x12 + i++ + i = encodeVarintMessage(dAtA, i, uint64(m.Flag_Consul_V0_8_3.Size())) + n11, err := m.Flag_Consul_V0_8_3.MarshalTo(dAtA[i:]) + if err != nil { + return 0, err + } + i += n11 } if m.Flag_Cetcd_Beta != nil { dAtA[i] = 0x82 @@ -333,11 +358,11 @@ func (m *Request) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x19 i++ i = encodeVarintMessage(dAtA, i, uint64(m.Flag_Cetcd_Beta.Size())) - n10, err := m.Flag_Cetcd_Beta.MarshalTo(dAtA[i:]) + n12, err := m.Flag_Cetcd_Beta.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n10 + i += n12 } if m.Flag_Zetcd_Beta != nil { dAtA[i] = 0xa2 @@ -345,11 +370,11 @@ func (m *Request) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x1f i++ i = encodeVarintMessage(dAtA, i, uint64(m.Flag_Zetcd_Beta.Size())) - n11, err := m.Flag_Zetcd_Beta.MarshalTo(dAtA[i:]) + n13, err := m.Flag_Zetcd_Beta.MarshalTo(dAtA[i:]) if err != nil { return 0, err } - i += n11 + i += n13 } return i, nil } @@ -468,6 +493,10 @@ func (m *Request) Size() (n int) { l = m.Flag_Zookeeper_R3_5_2Alpha.Size() n += 2 + l + sovMessage(uint64(l)) } + if m.Flag_Zookeeper_R3_5_3Beta != nil { + l = m.Flag_Zookeeper_R3_5_3Beta.Size() + n += 2 + l + sovMessage(uint64(l)) + } if m.Flag_Consul_V0_7_5 != nil { l = m.Flag_Consul_V0_7_5.Size() n += 2 + l + sovMessage(uint64(l)) @@ -476,6 +505,10 @@ func (m *Request) Size() (n int) { l = m.Flag_Consul_V0_8_0.Size() n += 2 + l + sovMessage(uint64(l)) } + if m.Flag_Consul_V0_8_3 != nil { + l = m.Flag_Consul_V0_8_3.Size() + n += 2 + l + sovMessage(uint64(l)) + } if m.Flag_Cetcd_Beta != nil { l = m.Flag_Cetcd_Beta.Size() n += 2 + l + sovMessage(uint64(l)) @@ -926,6 +959,39 @@ func (m *Request) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 202: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Flag_Zookeeper_R3_5_3Beta", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMessage + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthMessage + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Flag_Zookeeper_R3_5_3Beta == nil { + m.Flag_Zookeeper_R3_5_3Beta = &Flag_Zookeeper_R3_5_3Beta{} + } + if err := m.Flag_Zookeeper_R3_5_3Beta.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 300: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Flag_Consul_V0_7_5", wireType) @@ -992,6 +1058,39 @@ func (m *Request) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 302: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field Flag_Consul_V0_8_3", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowMessage + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= (int(b) & 0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthMessage + } + postIndex := iNdEx + msglen + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.Flag_Consul_V0_8_3 == nil { + m.Flag_Consul_V0_8_3 = &Flag_Consul_V0_8_3{} + } + if err := m.Flag_Consul_V0_8_3.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 400: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Flag_Cetcd_Beta", wireType) @@ -1276,52 +1375,55 @@ var ( func init() { proto.RegisterFile("dbtesterpb/message.proto", fileDescriptorMessage) } var fileDescriptorMessage = []byte{ - // 752 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0xdf, 0x4e, 0xdb, 0x48, - 0x14, 0xc6, 0x63, 0xc2, 0x9f, 0x64, 0xa2, 0xb0, 0x61, 0x60, 0xd9, 0x51, 0x80, 0xac, 0xc5, 0xae, - 0x50, 0x16, 0x69, 0x93, 0x60, 0x93, 0x05, 0x2e, 0x21, 0xec, 0x8a, 0x48, 0xdb, 0x82, 0x26, 0x01, - 0x55, 0xdc, 0x8c, 0xc6, 0xce, 0xc4, 0x58, 0x24, 0xb6, 0x3b, 0x9e, 0xa0, 0x96, 0xa7, 0xe8, 0x65, - 0xdf, 0xa1, 0xed, 0x7b, 0xd0, 0xbb, 0x3e, 0x42, 0x4b, 0x5f, 0xa1, 0x0f, 0x50, 0x79, 0x9c, 0x90, - 0xc9, 0x1f, 0x4a, 0xef, 0x38, 0xdf, 0xf7, 0xcd, 0xef, 0x68, 0x8e, 0x99, 0x13, 0x80, 0x5a, 0x96, - 0x60, 0xa1, 0x60, 0x3c, 0xb0, 0xca, 0x5d, 0x16, 0x86, 0xd4, 0x61, 0xa5, 0x80, 0xfb, 0xc2, 0x87, - 0x60, 0xe8, 0xe4, 0xff, 0x76, 0x5c, 0x71, 0xd5, 0xb3, 0x4a, 0xb6, 0xdf, 0x2d, 0x3b, 0xbe, 0xe3, - 0x97, 0x65, 0xc4, 0xea, 0xb5, 0x65, 0x25, 0x0b, 0xf9, 0x57, 0x7c, 0x34, 0xbf, 0xae, 0x40, 0x5b, - 0x54, 0x50, 0x8b, 0x86, 0x8c, 0xb8, 0xad, 0xbe, 0x9b, 0x57, 0xdc, 0x76, 0x87, 0x3a, 0x84, 0x09, - 0x7b, 0xe0, 0xfd, 0x3e, 0xee, 0xdd, 0xfa, 0xfe, 0x35, 0x63, 0x01, 0xe3, 0x53, 0xd0, 0x32, 0x60, - 0xfb, 0x5e, 0xd8, 0xeb, 0xf4, 0xdd, 0xb5, 0x89, 0xe3, 0x0a, 0x7b, 0xc2, 0xb4, 0x15, 0x73, 0x4b, - 0x31, 0x6d, 0xdf, 0x6b, 0xbb, 0x0e, 0xb1, 0x3b, 0x2e, 0xf3, 0x04, 0xe9, 0x52, 0xfb, 0xca, 0xf5, - 0xfa, 0x53, 0xd9, 0x7c, 0x97, 0x06, 0x0b, 0x98, 0xbd, 0xec, 0xb1, 0x50, 0x40, 0x13, 0xa4, 0x4f, - 0x03, 0xc6, 0xa9, 0x70, 0x7d, 0x0f, 0x69, 0xba, 0x56, 0x5c, 0x34, 0x7e, 0x2d, 0x0d, 0x39, 0xa5, - 0x07, 0x13, 0x0f, 0x73, 0x70, 0x1b, 0xe4, 0x9a, 0xdc, 0x75, 0x1c, 0xc6, 0xff, 0xf7, 0x9d, 0xf3, - 0xa0, 0xe3, 0xd3, 0x16, 0x9a, 0xd1, 0xb5, 0x62, 0x0a, 0x4f, 0xe8, 0xf0, 0x1f, 0x00, 0x8e, 0xfb, - 0xe3, 0xab, 0x1f, 0xa3, 0xa4, 0xec, 0xb0, 0xaa, 0x76, 0x18, 0xba, 0x58, 0x49, 0x42, 0x1d, 0x64, - 0x06, 0x55, 0x93, 0x3a, 0x68, 0x56, 0xd7, 0x8a, 0x69, 0xac, 0x4a, 0xf0, 0x4f, 0x90, 0x3d, 0x63, - 0x8c, 0xd7, 0xcf, 0xc2, 0x86, 0xe0, 0xae, 0xe7, 0xa0, 0x39, 0x99, 0x19, 0x15, 0x21, 0x02, 0x0b, - 0xf5, 0xb3, 0xba, 0xd7, 0x62, 0xaf, 0xd0, 0xbc, 0xae, 0x15, 0xb3, 0x78, 0x50, 0xc2, 0x0a, 0x58, - 0xae, 0xf5, 0x38, 0x67, 0x9e, 0xa8, 0xc9, 0x29, 0x3d, 0xef, 0x75, 0x2d, 0xc6, 0xd1, 0x82, 0xae, - 0x15, 0x93, 0x78, 0x9a, 0x05, 0xdb, 0x20, 0x5f, 0x93, 0x73, 0x8d, 0xd5, 0x67, 0xf1, 0x54, 0xeb, - 0x9e, 0x2b, 0x5c, 0xda, 0x41, 0x29, 0x5d, 0x2b, 0x66, 0x8c, 0x2d, 0xf5, 0x6e, 0x8f, 0xa7, 0xf1, - 0x0f, 0x48, 0xb0, 0x06, 0x72, 0xf2, 0xe3, 0xca, 0xff, 0x2a, 0x42, 0x6e, 0x0c, 0x62, 0xa2, 0x96, - 0xa4, 0xaf, 0xab, 0xf4, 0xf1, 0x0c, 0xce, 0x44, 0xca, 0xbf, 0xc2, 0x6e, 0x5d, 0x18, 0xe6, 0x04, - 0xc4, 0x24, 0x3b, 0x88, 0x3d, 0x01, 0x31, 0xc9, 0x8e, 0x02, 0x31, 0x77, 0xa6, 0x40, 0x0c, 0xd4, - 0x7e, 0x12, 0x62, 0xa8, 0x10, 0x03, 0x1e, 0x82, 0x5f, 0xd4, 0x80, 0x70, 0x03, 0xe4, 0x48, 0xc6, - 0xda, 0x63, 0x0c, 0xe1, 0x06, 0x43, 0x44, 0xd3, 0x0d, 0xe0, 0x0b, 0xf0, 0x5b, 0xec, 0x3f, 0xbc, - 0x25, 0x42, 0xb8, 0x49, 0x76, 0xc9, 0x01, 0xba, 0xd3, 0x24, 0xeb, 0x8f, 0x49, 0xd6, 0x44, 0x16, - 0x2f, 0x45, 0xc6, 0xe5, 0x40, 0xc6, 0xe6, 0xee, 0x01, 0x74, 0xc1, 0xc6, 0xb4, 0x74, 0x95, 0x18, - 0x84, 0x76, 0x82, 0x2b, 0x8a, 0x3e, 0xc6, 0xfc, 0xbf, 0x9e, 0xe2, 0x3f, 0x9c, 0xc0, 0xab, 0x63, - 0x5d, 0xaa, 0xc6, 0x61, 0xa4, 0xc3, 0x53, 0xb0, 0x12, 0x1f, 0x8c, 0xdf, 0x3b, 0x21, 0x37, 0x15, - 0xb2, 0x47, 0xaa, 0xe8, 0xfd, 0x8c, 0xec, 0xa0, 0x4f, 0x76, 0x18, 0x0d, 0xe2, 0xc5, 0x48, 0xad, - 0x49, 0xed, 0xa2, 0xb2, 0x57, 0x9d, 0x0a, 0xdc, 0x27, 0x15, 0xf4, 0xe1, 0x67, 0x80, 0xfb, 0xa4, - 0x32, 0x0a, 0xdc, 0xaf, 0xc0, 0x13, 0xb0, 0xd4, 0xcf, 0xc5, 0xdf, 0xc1, 0x62, 0x82, 0xa2, 0x37, - 0x49, 0x49, 0xdb, 0x98, 0x42, 0x1b, 0xa6, 0x70, 0x56, 0xa2, 0x22, 0xe1, 0x88, 0x09, 0x3a, 0x24, - 0xdd, 0x2a, 0xa4, 0x6f, 0x8f, 0x92, 0x6e, 0xc7, 0x49, 0x97, 0x03, 0xd2, 0xe6, 0x05, 0x48, 0x61, - 0x16, 0x06, 0xbe, 0x17, 0xb2, 0xe8, 0x31, 0x37, 0x7a, 0xb6, 0xcd, 0xc2, 0x50, 0xee, 0xaa, 0x14, - 0x1e, 0x94, 0xd1, 0x63, 0x3e, 0x76, 0xc3, 0xeb, 0x46, 0x40, 0x6d, 0x76, 0x1e, 0xfd, 0x02, 0x1c, - 0xbd, 0x16, 0x2c, 0x94, 0x5b, 0x29, 0x89, 0xa7, 0x59, 0xdb, 0x65, 0x65, 0xf3, 0xc1, 0x34, 0x98, - 0x6b, 0x08, 0xca, 0x45, 0x2e, 0x01, 0x53, 0x60, 0xb6, 0x21, 0xfc, 0x20, 0xa7, 0xc1, 0x2c, 0x48, - 0x9f, 0x30, 0xca, 0x85, 0xc5, 0xa8, 0xc8, 0xcd, 0x18, 0xff, 0x81, 0x4c, 0x93, 0x53, 0x2f, 0x0c, - 0x7c, 0x2e, 0x18, 0x87, 0x7b, 0x20, 0x25, 0xcb, 0x36, 0xe3, 0x70, 0x59, 0xbd, 0x51, 0x7f, 0xb5, - 0xe6, 0x57, 0x46, 0xc5, 0xf8, 0x0a, 0x9b, 0x89, 0xa3, 0x95, 0xbb, 0x2f, 0x85, 0xc4, 0xdd, 0x7d, - 0x41, 0xfb, 0x74, 0x5f, 0xd0, 0x3e, 0xdf, 0x17, 0xb4, 0xb7, 0x5f, 0x0b, 0x09, 0x6b, 0x5e, 0xee, - 0x66, 0xf3, 0x7b, 0x00, 0x00, 0x00, 0xff, 0xff, 0xd4, 0x82, 0xf6, 0x92, 0xcd, 0x06, 0x00, 0x00, + // 786 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x8c, 0x95, 0x5f, 0x4e, 0xeb, 0x46, + 0x14, 0xc6, 0x63, 0x72, 0xef, 0x25, 0x99, 0x28, 0xb7, 0x61, 0xf8, 0xd3, 0x51, 0x80, 0xd4, 0xa2, + 0x15, 0x4a, 0x91, 0x9a, 0x04, 0x9b, 0x14, 0x78, 0x84, 0xd0, 0x8a, 0x48, 0x6d, 0x41, 0x93, 0x80, + 0x2a, 0x5e, 0x46, 0x63, 0x67, 0x62, 0x2c, 0x12, 0xdb, 0x1d, 0x4f, 0x50, 0xcb, 0x2a, 0xfa, 0xd8, + 0x45, 0xb4, 0x5d, 0x07, 0xed, 0x53, 0x97, 0xd0, 0xd2, 0x2e, 0xa1, 0x0b, 0xa8, 0x3c, 0xce, 0x9f, + 0x49, 0xe2, 0x34, 0xbc, 0x71, 0xbe, 0xef, 0x3b, 0xbf, 0x23, 0x1f, 0x9c, 0x63, 0x80, 0x3a, 0x96, + 0x60, 0xa1, 0x60, 0x3c, 0xb0, 0xaa, 0x7d, 0x16, 0x86, 0xd4, 0x61, 0x95, 0x80, 0xfb, 0xc2, 0x87, + 0x60, 0xe2, 0x14, 0x3f, 0x73, 0x5c, 0x71, 0x3f, 0xb0, 0x2a, 0xb6, 0xdf, 0xaf, 0x3a, 0xbe, 0xe3, + 0x57, 0x65, 0xc4, 0x1a, 0x74, 0x65, 0x25, 0x0b, 0xf9, 0x57, 0xdc, 0x5a, 0xdc, 0x51, 0xa0, 0x1d, + 0x2a, 0xa8, 0x45, 0x43, 0x46, 0xdc, 0xce, 0xd0, 0x2d, 0x2a, 0x6e, 0xb7, 0x47, 0x1d, 0xc2, 0x84, + 0x3d, 0xf2, 0x3e, 0x9a, 0xf5, 0x9e, 0x7c, 0xff, 0x81, 0xb1, 0x80, 0xf1, 0x04, 0xb4, 0x0c, 0xd8, + 0xbe, 0x17, 0x0e, 0x7a, 0x43, 0x77, 0x7b, 0xae, 0x5d, 0x61, 0xcf, 0x99, 0xb6, 0x62, 0xee, 0x2b, + 0xa6, 0xed, 0x7b, 0x5d, 0xd7, 0x21, 0x76, 0xcf, 0x65, 0x9e, 0x20, 0x7d, 0x6a, 0xdf, 0xbb, 0xde, + 0x70, 0x2b, 0x7b, 0xff, 0x00, 0xb0, 0x8a, 0xd9, 0x77, 0x03, 0x16, 0x0a, 0x68, 0x82, 0xec, 0x55, + 0xc0, 0x38, 0x15, 0xae, 0xef, 0x21, 0x4d, 0xd7, 0xca, 0xef, 0x8d, 0xcd, 0xca, 0x84, 0x53, 0x19, + 0x9b, 0x78, 0x92, 0x83, 0x07, 0xa0, 0xd0, 0xe6, 0xae, 0xe3, 0x30, 0xfe, 0x95, 0xef, 0xdc, 0x04, + 0x3d, 0x9f, 0x76, 0xd0, 0x8a, 0xae, 0x95, 0x33, 0x78, 0x4e, 0x87, 0x9f, 0x03, 0x70, 0x31, 0x5c, + 0x5f, 0xf3, 0x02, 0xa5, 0xe5, 0x84, 0x2d, 0x75, 0xc2, 0xc4, 0xc5, 0x4a, 0x12, 0xea, 0x20, 0x37, + 0xaa, 0xda, 0xd4, 0x41, 0x6f, 0x74, 0xad, 0x9c, 0xc5, 0xaa, 0x04, 0x3f, 0x01, 0xf9, 0x6b, 0xc6, + 0x78, 0xf3, 0x3a, 0x6c, 0x09, 0xee, 0x7a, 0x0e, 0x7a, 0x2b, 0x33, 0xd3, 0x22, 0x44, 0x60, 0xb5, + 0x79, 0xdd, 0xf4, 0x3a, 0xec, 0x7b, 0xf4, 0x4e, 0xd7, 0xca, 0x79, 0x3c, 0x2a, 0x61, 0x0d, 0xac, + 0x37, 0x06, 0x9c, 0x33, 0x4f, 0x34, 0xe4, 0x96, 0xbe, 0x19, 0xf4, 0x2d, 0xc6, 0xd1, 0xaa, 0xae, + 0x95, 0xd3, 0x38, 0xc9, 0x82, 0x5d, 0x50, 0x6c, 0xc8, 0xbd, 0xc6, 0xea, 0xd7, 0xf1, 0x56, 0x9b, + 0x9e, 0x2b, 0x5c, 0xda, 0x43, 0x19, 0x5d, 0x2b, 0xe7, 0x8c, 0x7d, 0xf5, 0xd9, 0x16, 0xa7, 0xf1, + 0xff, 0x90, 0x60, 0x03, 0x14, 0xe4, 0x3f, 0x57, 0xbe, 0x55, 0x84, 0x3c, 0x1a, 0xc4, 0x44, 0x1d, + 0x49, 0xdf, 0x51, 0xe9, 0xb3, 0x19, 0x9c, 0x8b, 0x94, 0x2f, 0x84, 0xdd, 0xb9, 0x35, 0xcc, 0x39, + 0x88, 0x49, 0x0e, 0x11, 0x5b, 0x02, 0x31, 0xc9, 0xa1, 0x02, 0x31, 0x0f, 0x13, 0x20, 0x06, 0xea, + 0x2e, 0x85, 0x18, 0x2a, 0xc4, 0x80, 0x67, 0xe0, 0x03, 0x35, 0x20, 0xdc, 0x00, 0x39, 0x92, 0xb1, + 0xbd, 0x88, 0x21, 0xdc, 0x60, 0x82, 0x68, 0xbb, 0x01, 0xfc, 0x16, 0x7c, 0x18, 0xfb, 0xe3, 0xdf, + 0x12, 0x21, 0xdc, 0x24, 0x47, 0xe4, 0x14, 0x3d, 0x6b, 0x92, 0xf5, 0xf1, 0x3c, 0x6b, 0x2e, 0x8b, + 0xd7, 0x22, 0xe3, 0x6e, 0x24, 0x63, 0xf3, 0xe8, 0x14, 0xba, 0x60, 0x37, 0x29, 0x5d, 0x27, 0x06, + 0xa1, 0xbd, 0xe0, 0x9e, 0xa2, 0xdf, 0x62, 0xfe, 0xa7, 0xcb, 0xf8, 0xe3, 0x0e, 0xbc, 0x35, 0x33, + 0xa5, 0x6e, 0x9c, 0x45, 0x3a, 0xec, 0x82, 0x9d, 0xe4, 0x46, 0x93, 0x58, 0x4c, 0x50, 0xf4, 0x7b, + 0x3c, 0xa9, 0xbc, 0x7c, 0x52, 0xdc, 0x80, 0x37, 0x67, 0x07, 0x99, 0xe7, 0x4c, 0x50, 0x78, 0x05, + 0x36, 0xe2, 0xb6, 0xf8, 0xae, 0x10, 0xf2, 0x58, 0x23, 0xc7, 0xa4, 0x8e, 0x7e, 0x5e, 0x91, 0x7c, + 0x7d, 0x9e, 0x3f, 0x1d, 0xc4, 0xef, 0x23, 0xb5, 0x21, 0xb5, 0xdb, 0xda, 0x71, 0x3d, 0x11, 0x78, + 0x42, 0x6a, 0xe8, 0x97, 0xd7, 0x00, 0x4f, 0x48, 0x6d, 0x1a, 0x78, 0x52, 0x5b, 0x00, 0x34, 0xd1, + 0xaf, 0xaf, 0x03, 0x9a, 0x33, 0x40, 0x13, 0x5e, 0x82, 0xb5, 0x61, 0x2e, 0x7e, 0x81, 0xe4, 0x3e, + 0x7f, 0x4c, 0x4b, 0xda, 0x6e, 0x02, 0x6d, 0x92, 0xc2, 0x79, 0x89, 0x8a, 0x04, 0xb9, 0xbc, 0x31, + 0xe9, 0x49, 0x21, 0xfd, 0xbb, 0x90, 0xf4, 0x34, 0x4b, 0xba, 0x1b, 0x91, 0xf6, 0x6e, 0x41, 0x06, + 0xb3, 0x30, 0xf0, 0xbd, 0x90, 0x45, 0x57, 0xa8, 0x35, 0xb0, 0x6d, 0x16, 0x86, 0xf2, 0xc8, 0x66, + 0xf0, 0xa8, 0x8c, 0xae, 0xd0, 0x85, 0x1b, 0x3e, 0xb4, 0x02, 0x6a, 0xb3, 0x9b, 0xe8, 0xd3, 0x75, + 0xfe, 0x83, 0x60, 0xa1, 0x3c, 0xa7, 0x69, 0x9c, 0x64, 0x1d, 0x54, 0x95, 0x93, 0x0d, 0xb3, 0xe0, + 0x6d, 0x4b, 0x50, 0x2e, 0x0a, 0x29, 0x98, 0x01, 0x6f, 0x5a, 0xc2, 0x0f, 0x0a, 0x1a, 0xcc, 0x83, + 0xec, 0x25, 0xa3, 0x5c, 0x58, 0x8c, 0x8a, 0xc2, 0x8a, 0xf1, 0x25, 0xc8, 0xb5, 0x39, 0xf5, 0xc2, + 0xc0, 0xe7, 0x82, 0x71, 0x78, 0x0c, 0x32, 0xb2, 0xec, 0x32, 0x0e, 0xd7, 0xd5, 0x27, 0x1a, 0x7e, + 0x13, 0x8a, 0x1b, 0xd3, 0x62, 0xfc, 0x08, 0x7b, 0xa9, 0xf3, 0x8d, 0xe7, 0xbf, 0x4a, 0xa9, 0xe7, + 0x97, 0x92, 0xf6, 0xc7, 0x4b, 0x49, 0xfb, 0xf3, 0xa5, 0xa4, 0xfd, 0xf4, 0x77, 0x29, 0x65, 0xbd, + 0x93, 0x1f, 0x15, 0xf3, 0xbf, 0x00, 0x00, 0x00, 0xff, 0xff, 0xb6, 0xdf, 0x47, 0xa0, 0x86, 0x07, + 0x00, 0x00, } diff --git a/dbtesterpb/message.proto b/dbtesterpb/message.proto index 6ef3c930..408d9538 100644 --- a/dbtesterpb/message.proto +++ b/dbtesterpb/message.proto @@ -25,7 +25,7 @@ service Transporter { enum Operation { Start = 0; Stop = 1; - Heartbeat = 2; + Heartbeat = 2; } message Request { @@ -52,9 +52,11 @@ message Request { flag__zookeeper__r3_4_9 flag__zookeeper__r3_4_9 = 200; flag__zookeeper__r3_5_2_alpha flag__zookeeper__r3_5_2_alpha = 201; + flag__zookeeper__r3_5_3_beta flag__zookeeper__r3_5_3_beta = 202; flag__consul__v0_7_5 flag__consul__v0_7_5 = 300; flag__consul__v0_8_0 flag__consul__v0_8_0 = 301; + flag__consul__v0_8_3 flag__consul__v0_8_3 = 302; flag__cetcd__beta flag__cetcd__beta = 400; flag__zetcd__beta flag__zetcd__beta = 500;