From 00a2e426be8bee9611e6c9228ca7c3e8f2c09fe6 Mon Sep 17 00:00:00 2001 From: Ben Darnell Date: Wed, 16 Nov 2016 18:45:51 +0800 Subject: [PATCH] storage: Renumber proposer-evaluated KV RaftCommand fields Older versions were writing non-nil but empty values into these fields, leading to problems on upgrade. Since there is no non-experimental use of these fields yet, renumber them to discard all old data. Fixes #10723 --- pkg/storage/storagebase/proposer_kv.pb.go | 151 +++++++++++----------- pkg/storage/storagebase/proposer_kv.proto | 4 +- 2 files changed, 77 insertions(+), 78 deletions(-) diff --git a/pkg/storage/storagebase/proposer_kv.pb.go b/pkg/storage/storagebase/proposer_kv.pb.go index 8a86efec52a5..72334385c73b 100644 --- a/pkg/storage/storagebase/proposer_kv.pb.go +++ b/pkg/storage/storagebase/proposer_kv.pb.go @@ -179,7 +179,7 @@ type RaftCommand struct { // TODO(tschottdorf): using an extra message here (and not just `bytes`) to // allow the generated RaftCommand to be compared directly. If // this costs an extra large allocation, we need to do something different. - WriteBatch *WriteBatch `protobuf:"bytes,10011,opt,name=write_batch,json=writeBatch" json:"write_batch,omitempty"` + WriteBatch *WriteBatch `protobuf:"bytes,10014,opt,name=write_batch,json=writeBatch" json:"write_batch,omitempty"` } func (m *RaftCommand) Reset() { *m = RaftCommand{} } @@ -499,29 +499,29 @@ func (m *RaftCommand) MarshalTo(dAtA []byte) (int, error) { dAtA[i] = 0x20 i++ i = encodeVarintProposerKv(dAtA, i, uint64(m.MaxLeaseIndex)) - if m.WriteBatch != nil { - dAtA[i] = 0xda + if m.ReplicatedProposalData != nil { + dAtA[i] = 0xea i++ dAtA[i] = 0xf1 i++ dAtA[i] = 0x4 i++ - i = encodeVarintProposerKv(dAtA, i, uint64(m.WriteBatch.Size())) - n14, err := m.WriteBatch.MarshalTo(dAtA[i:]) + i = encodeVarintProposerKv(dAtA, i, uint64(m.ReplicatedProposalData.Size())) + n14, err := m.ReplicatedProposalData.MarshalTo(dAtA[i:]) if err != nil { return 0, err } i += n14 } - if m.ReplicatedProposalData != nil { - dAtA[i] = 0xea + if m.WriteBatch != nil { + dAtA[i] = 0xf2 i++ dAtA[i] = 0xf1 i++ dAtA[i] = 0x4 i++ - i = encodeVarintProposerKv(dAtA, i, uint64(m.ReplicatedProposalData.Size())) - n15, err := m.ReplicatedProposalData.MarshalTo(dAtA[i:]) + i = encodeVarintProposerKv(dAtA, i, uint64(m.WriteBatch.Size())) + n15, err := m.WriteBatch.MarshalTo(dAtA[i:]) if err != nil { return 0, err } @@ -635,14 +635,14 @@ func (m *RaftCommand) Size() (n int) { n += 1 + l + sovProposerKv(uint64(l)) } n += 1 + sovProposerKv(uint64(m.MaxLeaseIndex)) - if m.WriteBatch != nil { - l = m.WriteBatch.Size() - n += 3 + l + sovProposerKv(uint64(l)) - } if m.ReplicatedProposalData != nil { l = m.ReplicatedProposalData.Size() n += 3 + l + sovProposerKv(uint64(l)) } + if m.WriteBatch != nil { + l = m.WriteBatch.Size() + n += 3 + l + sovProposerKv(uint64(l)) + } return n } @@ -1473,9 +1473,9 @@ func (m *RaftCommand) Unmarshal(dAtA []byte) error { break } } - case 10011: + case 10013: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field WriteBatch", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field ReplicatedProposalData", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1499,16 +1499,16 @@ func (m *RaftCommand) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.WriteBatch == nil { - m.WriteBatch = &WriteBatch{} + if m.ReplicatedProposalData == nil { + m.ReplicatedProposalData = &ReplicatedProposalData{} } - if err := m.WriteBatch.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.ReplicatedProposalData.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex - case 10013: + case 10014: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field ReplicatedProposalData", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field WriteBatch", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -1532,10 +1532,10 @@ func (m *RaftCommand) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if m.ReplicatedProposalData == nil { - m.ReplicatedProposalData = &ReplicatedProposalData{} + if m.WriteBatch == nil { + m.WriteBatch = &WriteBatch{} } - if err := m.ReplicatedProposalData.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.WriteBatch.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -1670,57 +1670,56 @@ func init() { } var fileDescriptorProposerKv = []byte{ - // 823 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x54, 0xdb, 0x6e, 0x1b, 0x45, - 0x18, 0xce, 0x36, 0x76, 0xd9, 0x8c, 0x21, 0xb1, 0x46, 0x55, 0x34, 0xaa, 0x54, 0xdb, 0xb2, 0x42, - 0x15, 0x44, 0xbb, 0xcb, 0x41, 0x5c, 0xf5, 0xce, 0x8e, 0x50, 0x1b, 0x52, 0x0b, 0x26, 0x85, 0x4a, - 0x20, 0xb1, 0x1a, 0x8f, 0xa7, 0xbb, 0x23, 0xef, 0x89, 0x99, 0x71, 0x1b, 0x78, 0x0a, 0xca, 0xa1, - 0x1c, 0xda, 0x3e, 0x00, 0x6f, 0x92, 0xcb, 0xde, 0x20, 0x71, 0x15, 0x81, 0x79, 0x11, 0x34, 0x87, - 0x8d, 0xed, 0x76, 0x9b, 0x44, 0x5c, 0xed, 0xec, 0xcc, 0xf7, 0x7d, 0xf3, 0x1f, 0xbe, 0x7f, 0xc0, - 0x87, 0xb4, 0xa0, 0x53, 0x51, 0x10, 0x9a, 0x84, 0xe5, 0x34, 0x0e, 0xa5, 0x2a, 0x04, 0x89, 0x59, - 0xf5, 0x1d, 0x13, 0xc9, 0xc2, 0x52, 0x14, 0x65, 0x21, 0x99, 0x88, 0xa6, 0x0f, 0x83, 0x52, 0x14, - 0xaa, 0x80, 0xd7, 0x4e, 0x49, 0x81, 0x03, 0x06, 0x4b, 0x84, 0xab, 0xdd, 0x55, 0x4d, 0xb3, 0x2a, - 0xc7, 0x21, 0x29, 0xb9, 0xe5, 0x5f, 0xed, 0xd5, 0x03, 0x26, 0x44, 0x11, 0x87, 0xd8, 0xa9, 0x47, - 0x64, 0x4c, 0x91, 0x25, 0xd4, 0x7b, 0xf5, 0xc1, 0xb3, 0x3c, 0xe6, 0x79, 0xf5, 0xd1, 0xac, 0x87, - 0x94, 0x3a, 0xc6, 0xcd, 0xf3, 0xd3, 0x95, 0x8a, 0x28, 0xe6, 0xe0, 0xd7, 0x57, 0xe1, 0x33, 0xc5, - 0xd3, 0x30, 0x49, 0x69, 0xa8, 0x78, 0xc6, 0xa4, 0x22, 0x59, 0xe9, 0x70, 0x57, 0xe2, 0x22, 0x2e, - 0xcc, 0x32, 0xd4, 0x2b, 0xbb, 0xdb, 0xff, 0xc3, 0x03, 0xcd, 0xc3, 0x32, 0xe5, 0x0a, 0x0e, 0xc1, - 0x1b, 0x4a, 0xf0, 0x38, 0x66, 0x02, 0x79, 0x3d, 0x6f, 0xb7, 0xf5, 0x41, 0x37, 0x58, 0x94, 0xd0, - 0x25, 0x17, 0x18, 0xe8, 0x3d, 0x0b, 0x1b, 0xf8, 0xc7, 0x27, 0xdd, 0xb5, 0x17, 0x27, 0x5d, 0x0f, - 0x57, 0x4c, 0xf8, 0x15, 0xd8, 0x10, 0x89, 0x8c, 0x26, 0x2c, 0x55, 0x04, 0x5d, 0x32, 0x32, 0x37, - 0x82, 0x57, 0x3b, 0x61, 0xd3, 0x0e, 0xaa, 0xec, 0x83, 0xbb, 0x5f, 0x0c, 0x87, 0x87, 0x8a, 0x28, - 0x39, 0x68, 0x6b, 0xcd, 0xf9, 0x49, 0xd7, 0xc7, 0xb7, 0x0f, 0xf7, 0xb4, 0x0a, 0xf6, 0x45, 0x22, - 0xcd, 0xaa, 0x7f, 0x00, 0x9a, 0x77, 0x99, 0x88, 0xd9, 0xc5, 0x42, 0x35, 0xd0, 0xd7, 0x87, 0xda, - 0xff, 0x1a, 0x6c, 0x0e, 0x13, 0x92, 0xc7, 0x0c, 0xb3, 0x32, 0xe5, 0x94, 0x48, 0x78, 0xf0, 0xb2, - 0xec, 0x6e, 0x8d, 0xec, 0x2a, 0xe7, 0x0c, 0xfd, 0x3f, 0x9b, 0x60, 0xdb, 0xc1, 0x14, 0x9b, 0x7c, - 0x6a, 0x0c, 0x4a, 0xd2, 0x3d, 0xa2, 0x08, 0xbc, 0x0e, 0x5a, 0xe3, 0xb4, 0xa0, 0xd3, 0x48, 0x30, - 0x32, 0x91, 0xe8, 0xf1, 0xa8, 0xe7, 0xed, 0xfa, 0x83, 0x86, 0xd6, 0xc0, 0xc0, 0x9c, 0x60, 0x7d, - 0x00, 0x6f, 0x83, 0xa6, 0xe9, 0x34, 0xfa, 0x61, 0x64, 0xe2, 0x79, 0x37, 0x38, 0xd3, 0xd4, 0x81, - 0xbb, 0x4e, 0x57, 0x92, 0x39, 0x39, 0x2b, 0x00, 0x6f, 0x81, 0xa6, 0xd4, 0xad, 0x43, 0x3f, 0x5a, - 0xa5, 0x9d, 0x73, 0x94, 0x4c, 0x9f, 0xb1, 0xe5, 0x68, 0x72, 0xa6, 0x8b, 0x89, 0x7e, 0xba, 0x18, - 0xd9, 0x54, 0x1e, 0x5b, 0x0e, 0xfc, 0x1c, 0xb4, 0x69, 0x91, 0x95, 0x33, 0xc5, 0x22, 0x9a, 0x30, - 0x3a, 0x95, 0xb3, 0x0c, 0xfd, 0x6c, 0x75, 0xde, 0xa9, 0x2b, 0xaf, 0xc5, 0x0e, 0x1d, 0x14, 0xb3, - 0x6f, 0x66, 0x4c, 0x2a, 0xbc, 0x45, 0x57, 0xf7, 0x61, 0x08, 0xda, 0x5c, 0x46, 0x29, 0x23, 0x92, - 0x45, 0xc2, 0x82, 0xd0, 0x93, 0xe5, 0x3a, 0x6e, 0x72, 0x79, 0xa0, 0x4f, 0x9d, 0x02, 0xec, 0x83, - 0x0d, 0x2e, 0xa3, 0x07, 0x82, 0xb1, 0xef, 0x18, 0xfa, 0x65, 0x19, 0xe9, 0x73, 0xf9, 0xb1, 0xd9, - 0x86, 0x03, 0xb0, 0x71, 0x3a, 0x35, 0xe8, 0x57, 0x1b, 0xe4, 0xb5, 0xa5, 0x20, 0xf5, 0x6c, 0x05, - 0x49, 0x4a, 0x83, 0x7b, 0x15, 0xca, 0x49, 0x2c, 0x68, 0xf0, 0x16, 0xd8, 0xe6, 0x32, 0xa2, 0x45, - 0x2e, 0xb9, 0x54, 0x2c, 0xa7, 0xdf, 0x46, 0x82, 0xa5, 0xda, 0x01, 0xe8, 0xb7, 0xe5, 0x4b, 0xaf, - 0x70, 0x39, 0x5c, 0x60, 0xb0, 0x85, 0xc0, 0x3b, 0xa0, 0x69, 0x47, 0xe7, 0xf7, 0xd1, 0xff, 0x98, - 0x1d, 0xd7, 0x71, 0xa3, 0x00, 0xef, 0x83, 0x2d, 0x6a, 0xac, 0x1a, 0x09, 0xe7, 0x55, 0xf4, 0xcc, - 0x8a, 0xde, 0x3c, 0xa7, 0x7d, 0xab, 0x0e, 0xc7, 0x9b, 0x74, 0xe5, 0xbf, 0xdf, 0x03, 0xe0, 0xbe, - 0xe0, 0x8a, 0x0d, 0x88, 0xa2, 0x09, 0x84, 0xa0, 0xa1, 0x1f, 0x3b, 0x33, 0x30, 0x6f, 0x62, 0xb3, - 0xee, 0x3f, 0x59, 0x07, 0x2d, 0x4c, 0x1e, 0xa8, 0x61, 0x91, 0x65, 0x24, 0x9f, 0xc0, 0xcf, 0xc0, - 0x66, 0x21, 0x78, 0xcc, 0xf3, 0x2a, 0x14, 0xf7, 0x32, 0xec, 0xd4, 0xf4, 0xdf, 0x5d, 0xb3, 0xc7, - 0x24, 0x15, 0xbc, 0x54, 0x85, 0x70, 0x59, 0xbd, 0x65, 0x15, 0xdc, 0x31, 0x7c, 0x1f, 0xac, 0xd3, - 0x6c, 0x82, 0xd6, 0x5f, 0x3b, 0xfd, 0x26, 0xba, 0xca, 0x3d, 0x1a, 0x0b, 0x6f, 0x80, 0xad, 0x8c, - 0x1c, 0x39, 0xcb, 0xf0, 0x7c, 0xc2, 0x8e, 0x50, 0xa3, 0xe7, 0xed, 0x36, 0xaa, 0x0b, 0x32, 0x72, - 0x64, 0x0c, 0x73, 0x47, 0x1f, 0xc1, 0x4f, 0x40, 0xeb, 0x91, 0xce, 0x32, 0x1a, 0x6b, 0x21, 0xf4, - 0xf4, 0x55, 0xc7, 0xd6, 0x95, 0x6e, 0x51, 0x18, 0x0c, 0x1e, 0x2d, 0x8a, 0x54, 0x02, 0x24, 0x4e, - 0x5f, 0x82, 0xa8, 0x74, 0x4f, 0x41, 0x64, 0x0a, 0xf7, 0xdc, 0x2a, 0x7f, 0x74, 0xb1, 0xd1, 0x7e, - 0xe9, 0x25, 0xc1, 0xdb, 0xa2, 0x76, 0x7f, 0xbf, 0xe1, 0x7b, 0xed, 0x4b, 0xfb, 0x97, 0xfd, 0xc7, - 0xa3, 0xf6, 0xd3, 0xd1, 0xfe, 0x65, 0xff, 0xd9, 0xa8, 0xfd, 0x7c, 0x34, 0x78, 0xfb, 0xf8, 0x9f, - 0xce, 0xda, 0xf1, 0xbc, 0xe3, 0xbd, 0x98, 0x77, 0xbc, 0xbf, 0xe6, 0x1d, 0xef, 0xef, 0x79, 0xc7, - 0xfb, 0xfe, 0xdf, 0xce, 0xda, 0x97, 0xad, 0xa5, 0xbb, 0xfe, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x4a, - 0x1d, 0x65, 0x5b, 0x70, 0x07, 0x00, 0x00, + // 813 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0x9c, 0x54, 0x5b, 0x6f, 0x1b, 0x45, + 0x18, 0xcd, 0x36, 0x36, 0x38, 0x63, 0x70, 0xac, 0x51, 0x15, 0x8d, 0x2a, 0xd5, 0xb6, 0xac, 0x50, + 0x19, 0xd1, 0xee, 0x72, 0x11, 0x4f, 0x7d, 0xb3, 0x23, 0xd4, 0x96, 0xd4, 0x82, 0x49, 0xa1, 0x12, + 0x48, 0xac, 0xc6, 0xe3, 0xe9, 0xee, 0xc8, 0x7b, 0x63, 0x66, 0xdc, 0x06, 0x7e, 0x04, 0xa2, 0xdc, + 0x41, 0x94, 0x77, 0xfe, 0x49, 0x1e, 0xfb, 0x82, 0xc4, 0x53, 0x04, 0xe6, 0x8f, 0xa0, 0xb9, 0xac, + 0x2f, 0xed, 0x36, 0x89, 0xfa, 0xe4, 0xcf, 0x3b, 0xe7, 0x9c, 0xf9, 0x6e, 0x67, 0xc0, 0x7b, 0x34, + 0xa7, 0x33, 0x91, 0x13, 0x1a, 0x07, 0xc5, 0x2c, 0x0a, 0xa4, 0xca, 0x05, 0x89, 0x58, 0xf9, 0x3b, + 0x21, 0x92, 0x05, 0x85, 0xc8, 0x8b, 0x5c, 0x32, 0x11, 0xce, 0x1e, 0xfa, 0x85, 0xc8, 0x55, 0x0e, + 0xaf, 0x2e, 0x49, 0xbe, 0x03, 0xfa, 0x6b, 0x84, 0x2b, 0xdd, 0x4d, 0x4d, 0x13, 0x15, 0x93, 0x80, + 0x14, 0xdc, 0xf2, 0xaf, 0xf4, 0xaa, 0x01, 0x53, 0xa2, 0x88, 0x43, 0xec, 0x57, 0x23, 0x52, 0xa6, + 0xc8, 0x1a, 0xea, 0xed, 0xea, 0xe4, 0x59, 0x16, 0xf1, 0xac, 0xfc, 0xd1, 0xac, 0x87, 0x94, 0x3a, + 0xc6, 0x8d, 0xf3, 0xcb, 0x95, 0x8a, 0x28, 0xe6, 0xe0, 0xd7, 0x36, 0xe1, 0x73, 0xc5, 0x93, 0x20, + 0x4e, 0x68, 0xa0, 0x78, 0xca, 0xa4, 0x22, 0x69, 0xe1, 0x70, 0x97, 0xa3, 0x3c, 0xca, 0x4d, 0x18, + 0xe8, 0xc8, 0x7e, 0xed, 0xff, 0xe9, 0x81, 0xfa, 0x51, 0x91, 0x70, 0x05, 0x47, 0xe0, 0x55, 0x25, + 0x78, 0x14, 0x31, 0x81, 0xbc, 0x9e, 0x37, 0x68, 0xbe, 0xdb, 0xf5, 0x57, 0x2d, 0x74, 0xc5, 0xf9, + 0x06, 0x7a, 0xcf, 0xc2, 0x86, 0x8d, 0x93, 0xd3, 0xee, 0xd6, 0xd3, 0xd3, 0xae, 0x87, 0x4b, 0x26, + 0xfc, 0x1c, 0xec, 0x88, 0x58, 0x86, 0x53, 0x96, 0x28, 0x82, 0x2e, 0x19, 0x99, 0xeb, 0xfe, 0xf3, + 0x93, 0xb0, 0x65, 0xfb, 0x65, 0xf5, 0xfe, 0xdd, 0x4f, 0x47, 0xa3, 0x23, 0x45, 0x94, 0x1c, 0xb6, + 0xb5, 0xe6, 0xe2, 0xb4, 0xdb, 0xc0, 0xb7, 0x8e, 0x0e, 0xb4, 0x0a, 0x6e, 0x88, 0x58, 0x9a, 0xa8, + 0x7f, 0x08, 0xea, 0x77, 0x99, 0x88, 0xd8, 0xc5, 0x52, 0x35, 0xd0, 0x17, 0xa7, 0xda, 0xff, 0x02, + 0xb4, 0x46, 0x31, 0xc9, 0x22, 0x86, 0x59, 0x91, 0x70, 0x4a, 0x24, 0x3c, 0x7c, 0x56, 0x76, 0x50, + 0x21, 0xbb, 0xc9, 0x39, 0x43, 0xff, 0xaf, 0x3a, 0xd8, 0x73, 0x30, 0xc5, 0xa6, 0x1f, 0x99, 0x05, + 0x25, 0xc9, 0x01, 0x51, 0x04, 0x5e, 0x03, 0xcd, 0x49, 0x92, 0xd3, 0x59, 0x28, 0x18, 0x99, 0x4a, + 0xf4, 0x78, 0xdc, 0xf3, 0x06, 0x8d, 0x61, 0x4d, 0x6b, 0x60, 0x60, 0x4e, 0xb0, 0x3e, 0x80, 0xb7, + 0x40, 0xdd, 0x4c, 0x1a, 0x7d, 0x37, 0x36, 0xf9, 0xbc, 0xe5, 0x9f, 0xb9, 0xd4, 0xbe, 0xbb, 0x4e, + 0x77, 0x92, 0x39, 0x39, 0x2b, 0x00, 0x6f, 0x82, 0xba, 0xd4, 0xa3, 0x43, 0xdf, 0x5b, 0xa5, 0xfd, + 0x73, 0x94, 0xcc, 0x9c, 0xb1, 0xe5, 0x68, 0x72, 0xaa, 0x9b, 0x89, 0x7e, 0xb8, 0x18, 0xd9, 0x74, + 0x1e, 0x5b, 0x0e, 0xfc, 0x04, 0xb4, 0x69, 0x9e, 0x16, 0x73, 0xc5, 0x42, 0x1a, 0x33, 0x3a, 0x93, + 0xf3, 0x14, 0xfd, 0x68, 0x75, 0xde, 0xac, 0x6a, 0xaf, 0xc5, 0x8e, 0x1c, 0x14, 0xb3, 0x2f, 0xe7, + 0x4c, 0x2a, 0xbc, 0x4b, 0x37, 0xbf, 0xc3, 0x00, 0xb4, 0xb9, 0x0c, 0x13, 0x46, 0x24, 0x0b, 0x85, + 0x05, 0xa1, 0x9f, 0xd6, 0xfb, 0xd8, 0xe2, 0xf2, 0x50, 0x9f, 0x3a, 0x05, 0xd8, 0x07, 0x3b, 0x5c, + 0x86, 0x0f, 0x04, 0x63, 0x5f, 0x33, 0xf4, 0xf3, 0x3a, 0xb2, 0xc1, 0xe5, 0x07, 0xe6, 0x33, 0x1c, + 0x82, 0x9d, 0xa5, 0x6b, 0xd0, 0x2f, 0x36, 0xc9, 0xab, 0x6b, 0x49, 0x6a, 0x6f, 0xf9, 0x71, 0x42, + 0xfd, 0x7b, 0x25, 0xca, 0x49, 0xac, 0x68, 0xf0, 0x26, 0xd8, 0xe3, 0x32, 0xa4, 0x79, 0x26, 0xb9, + 0x54, 0x2c, 0xa3, 0x5f, 0x85, 0x82, 0x25, 0x7a, 0x03, 0xd0, 0xaf, 0xeb, 0x97, 0x5e, 0xe6, 0x72, + 0xb4, 0xc2, 0x60, 0x0b, 0x81, 0xb7, 0x41, 0xdd, 0x5a, 0xe7, 0xb7, 0xf1, 0x4b, 0x78, 0xc7, 0x4d, + 0xdc, 0x28, 0xc0, 0xfb, 0x60, 0x97, 0x9a, 0x55, 0x0d, 0x85, 0xdb, 0x55, 0xf4, 0xbb, 0x15, 0xbd, + 0x71, 0xce, 0xf8, 0x36, 0x37, 0x1c, 0xb7, 0xe8, 0xc6, 0xff, 0x7e, 0x0f, 0x80, 0xfb, 0x82, 0x2b, + 0x36, 0x24, 0x8a, 0xc6, 0x10, 0x82, 0x9a, 0x7e, 0xec, 0x8c, 0x61, 0x5e, 0xc3, 0x26, 0xee, 0x7f, + 0xb3, 0x0d, 0x9a, 0x98, 0x3c, 0x50, 0xa3, 0x3c, 0x4d, 0x49, 0x36, 0x85, 0x1f, 0x83, 0x56, 0x2e, + 0x78, 0xc4, 0xb3, 0x32, 0x15, 0xf7, 0x32, 0xec, 0x57, 0xcc, 0xdf, 0x5d, 0x73, 0xc0, 0x24, 0x15, + 0xbc, 0x50, 0xb9, 0x70, 0x55, 0xbd, 0x6e, 0x15, 0xdc, 0x31, 0x7c, 0x07, 0x6c, 0xd3, 0x74, 0x8a, + 0xb6, 0x5f, 0xe8, 0x7e, 0x93, 0x5d, 0xb9, 0x3d, 0x1a, 0x0b, 0xaf, 0x83, 0xdd, 0x94, 0x1c, 0xbb, + 0x95, 0xe1, 0xd9, 0x94, 0x1d, 0xa3, 0x5a, 0xcf, 0x1b, 0xd4, 0xca, 0x0b, 0x52, 0x72, 0x6c, 0x16, + 0xe6, 0xb6, 0x3e, 0x82, 0x05, 0x40, 0x62, 0x69, 0xde, 0xb0, 0x70, 0xee, 0x0d, 0x4d, 0xad, 0x4f, + 0x6c, 0x1f, 0xdf, 0xbf, 0x98, 0x1b, 0x9f, 0x31, 0x3f, 0xde, 0x13, 0xd5, 0x8f, 0xc2, 0x87, 0xa0, + 0xf9, 0x48, 0xf7, 0x35, 0x9c, 0xe8, 0xd4, 0xd1, 0x1f, 0xcf, 0x7b, 0xa4, 0xea, 0x92, 0xd5, 0x28, + 0x30, 0x78, 0xb4, 0x8c, 0xef, 0xd4, 0x1a, 0x5e, 0xfb, 0xd2, 0x9d, 0x57, 0x1a, 0x8f, 0xc7, 0xed, + 0x27, 0xe3, 0xe1, 0x1b, 0x27, 0xff, 0x76, 0xb6, 0x4e, 0x16, 0x1d, 0xef, 0xe9, 0xa2, 0xe3, 0xfd, + 0xbd, 0xe8, 0x78, 0xff, 0x2c, 0x3a, 0xde, 0xb7, 0xff, 0x75, 0xb6, 0x3e, 0x6b, 0xae, 0x69, 0xfd, + 0x1f, 0x00, 0x00, 0xff, 0xff, 0xa4, 0x20, 0xd9, 0xe7, 0x68, 0x07, 0x00, 0x00, } diff --git a/pkg/storage/storagebase/proposer_kv.proto b/pkg/storage/storagebase/proposer_kv.proto index b0e38d52ca15..6f47828590b2 100644 --- a/pkg/storage/storagebase/proposer_kv.proto +++ b/pkg/storage/storagebase/proposer_kv.proto @@ -161,7 +161,7 @@ message RaftCommand { // TODO(tschottdorf): using an extra message here (and not just `bytes`) to // allow the generated RaftCommand to be compared directly. If // this costs an extra large allocation, we need to do something different. - optional WriteBatch write_batch = 10011; + optional WriteBatch write_batch = 10014; - reserved 1, 10001 to 10010, 10012; + reserved 1, 10001 to 10012; }