diff --git a/pkg/kv/kvserver/client_raft_test.go b/pkg/kv/kvserver/client_raft_test.go index deeac246a117..b50759fbf5b1 100644 --- a/pkg/kv/kvserver/client_raft_test.go +++ b/pkg/kv/kvserver/client_raft_test.go @@ -4725,7 +4725,7 @@ func TestAckWriteBeforeApplication(t *testing.T) { blockPreApplication, blockPostApplication := make(chan struct{}), make(chan struct{}) applyFilterFn := func(ch chan struct{}) kvserverbase.ReplicaApplyFilter { return func(filterArgs kvserverbase.ApplyFilterArgs) (int, *roachpb.Error) { - if atomic.LoadInt32(&filterActive) == 1 && filterArgs.Timestamp == magicTS { + if atomic.LoadInt32(&filterActive) == 1 && filterArgs.WriteTimestamp == magicTS { <-ch } return 0, nil diff --git a/pkg/kv/kvserver/client_replica_test.go b/pkg/kv/kvserver/client_replica_test.go index 9e0e2dffb00f..efc66a769264 100644 --- a/pkg/kv/kvserver/client_replica_test.go +++ b/pkg/kv/kvserver/client_replica_test.go @@ -3342,7 +3342,7 @@ func TestProposalOverhead(t *testing.T) { } // Sometime the logical portion of the timestamp can be non-zero which makes // the overhead non-deterministic. - args.Cmd.ReplicatedEvalResult.Timestamp.Logical = 0 + args.Cmd.ReplicatedEvalResult.WriteTimestamp.Logical = 0 atomic.StoreUint32(&overhead, uint32(args.Cmd.Size()-args.Cmd.WriteBatch.Size())) // We don't want to print the WriteBatch because it's explicitly // excluded from the size computation. Nil'ing it out does not diff --git a/pkg/kv/kvserver/kvserverpb/proposer_kv.pb.go b/pkg/kv/kvserver/kvserverpb/proposer_kv.pb.go index b32e09c26772..155f7bda0452 100644 --- a/pkg/kv/kvserver/kvserverpb/proposer_kv.pb.go +++ b/pkg/kv/kvserver/kvserverpb/proposer_kv.pb.go @@ -49,7 +49,7 @@ func (m *Split) Reset() { *m = Split{} } func (m *Split) String() string { return proto.CompactTextString(m) } func (*Split) ProtoMessage() {} func (*Split) Descriptor() ([]byte, []int) { - return fileDescriptor_proposer_kv_b3afad4305e873e3, []int{0} + return fileDescriptor_proposer_kv_4bc22ad6c349d68f, []int{0} } func (m *Split) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -84,7 +84,7 @@ func (m *Merge) Reset() { *m = Merge{} } func (m *Merge) String() string { return proto.CompactTextString(m) } func (*Merge) ProtoMessage() {} func (*Merge) Descriptor() ([]byte, []int) { - return fileDescriptor_proposer_kv_b3afad4305e873e3, []int{1} + return fileDescriptor_proposer_kv_4bc22ad6c349d68f, []int{1} } func (m *Merge) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -118,7 +118,7 @@ type ChangeReplicas struct { func (m *ChangeReplicas) Reset() { *m = ChangeReplicas{} } func (*ChangeReplicas) ProtoMessage() {} func (*ChangeReplicas) Descriptor() ([]byte, []int) { - return fileDescriptor_proposer_kv_b3afad4305e873e3, []int{2} + return fileDescriptor_proposer_kv_4bc22ad6c349d68f, []int{2} } func (m *ChangeReplicas) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -170,7 +170,7 @@ func (m *ComputeChecksum) Reset() { *m = ComputeChecksum{} } func (m *ComputeChecksum) String() string { return proto.CompactTextString(m) } func (*ComputeChecksum) ProtoMessage() {} func (*ComputeChecksum) Descriptor() ([]byte, []int) { - return fileDescriptor_proposer_kv_b3afad4305e873e3, []int{3} + return fileDescriptor_proposer_kv_4bc22ad6c349d68f, []int{3} } func (m *ComputeChecksum) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -207,7 +207,7 @@ func (m *Compaction) Reset() { *m = Compaction{} } func (m *Compaction) String() string { return proto.CompactTextString(m) } func (*Compaction) ProtoMessage() {} func (*Compaction) Descriptor() ([]byte, []int) { - return fileDescriptor_proposer_kv_b3afad4305e873e3, []int{4} + return fileDescriptor_proposer_kv_4bc22ad6c349d68f, []int{4} } func (m *Compaction) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -244,7 +244,7 @@ func (m *SuggestedCompaction) Reset() { *m = SuggestedCompaction{} } func (m *SuggestedCompaction) String() string { return proto.CompactTextString(m) } func (*SuggestedCompaction) ProtoMessage() {} func (*SuggestedCompaction) Descriptor() ([]byte, []int) { - return fileDescriptor_proposer_kv_b3afad4305e873e3, []int{5} + return fileDescriptor_proposer_kv_4bc22ad6c349d68f, []int{5} } func (m *SuggestedCompaction) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -285,10 +285,10 @@ type ReplicatedEvalResult struct { Merge *Merge `protobuf:"bytes,4,opt,name=merge,proto3" json:"merge,omitempty"` ComputeChecksum *ComputeChecksum `protobuf:"bytes,21,opt,name=compute_checksum,json=computeChecksum,proto3" json:"compute_checksum,omitempty"` IsLeaseRequest bool `protobuf:"varint,6,opt,name=is_lease_request,json=isLeaseRequest,proto3" json:"is_lease_request,omitempty"` - // The BatchRequest.Timestamp of the request that produced this command. Used - // to verify the validity of the command against the GC threshold and to - // update the followers' clocks. - Timestamp hlc.Timestamp `protobuf:"bytes,8,opt,name=timestamp,proto3" json:"timestamp"` + // The timestamp at which this command is writing. Used to verify the validity + // of the command against the GC threshold and to update the followers' + // clocks. + WriteTimestamp hlc.Timestamp `protobuf:"bytes,8,opt,name=write_timestamp,json=writeTimestamp,proto3" json:"write_timestamp"` // The stats delta corresponding to the data in this WriteBatch. On // a split, contains only the contributions to the left-hand side. DeprecatedDelta *enginepb.MVCCStats `protobuf:"bytes,10,opt,name=deprecated_delta,json=deprecatedDelta,proto3" json:"deprecated_delta,omitempty"` @@ -333,7 +333,7 @@ func (m *ReplicatedEvalResult) Reset() { *m = ReplicatedEvalResult{} } func (m *ReplicatedEvalResult) String() string { return proto.CompactTextString(m) } func (*ReplicatedEvalResult) ProtoMessage() {} func (*ReplicatedEvalResult) Descriptor() ([]byte, []int) { - return fileDescriptor_proposer_kv_b3afad4305e873e3, []int{6} + return fileDescriptor_proposer_kv_4bc22ad6c349d68f, []int{6} } func (m *ReplicatedEvalResult) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -377,7 +377,7 @@ func (m *ReplicatedEvalResult_AddSSTable) Reset() { *m = ReplicatedEvalR func (m *ReplicatedEvalResult_AddSSTable) String() string { return proto.CompactTextString(m) } func (*ReplicatedEvalResult_AddSSTable) ProtoMessage() {} func (*ReplicatedEvalResult_AddSSTable) Descriptor() ([]byte, []int) { - return fileDescriptor_proposer_kv_b3afad4305e873e3, []int{6, 0} + return fileDescriptor_proposer_kv_4bc22ad6c349d68f, []int{6, 0} } func (m *ReplicatedEvalResult_AddSSTable) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -414,7 +414,7 @@ func (m *WriteBatch) Reset() { *m = WriteBatch{} } func (m *WriteBatch) String() string { return proto.CompactTextString(m) } func (*WriteBatch) ProtoMessage() {} func (*WriteBatch) Descriptor() ([]byte, []int) { - return fileDescriptor_proposer_kv_b3afad4305e873e3, []int{7} + return fileDescriptor_proposer_kv_4bc22ad6c349d68f, []int{7} } func (m *WriteBatch) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -451,7 +451,7 @@ func (m *LogicalOpLog) Reset() { *m = LogicalOpLog{} } func (m *LogicalOpLog) String() string { return proto.CompactTextString(m) } func (*LogicalOpLog) ProtoMessage() {} func (*LogicalOpLog) Descriptor() ([]byte, []int) { - return fileDescriptor_proposer_kv_b3afad4305e873e3, []int{8} + return fileDescriptor_proposer_kv_4bc22ad6c349d68f, []int{8} } func (m *LogicalOpLog) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -579,7 +579,7 @@ func (m *RaftCommand) Reset() { *m = RaftCommand{} } func (m *RaftCommand) String() string { return proto.CompactTextString(m) } func (*RaftCommand) ProtoMessage() {} func (*RaftCommand) Descriptor() ([]byte, []int) { - return fileDescriptor_proposer_kv_b3afad4305e873e3, []int{9} + return fileDescriptor_proposer_kv_4bc22ad6c349d68f, []int{9} } func (m *RaftCommand) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -618,7 +618,7 @@ func (m *MaxLeaseFooter) Reset() { *m = MaxLeaseFooter{} } func (m *MaxLeaseFooter) String() string { return proto.CompactTextString(m) } func (*MaxLeaseFooter) ProtoMessage() {} func (*MaxLeaseFooter) Descriptor() ([]byte, []int) { - return fileDescriptor_proposer_kv_b3afad4305e873e3, []int{10} + return fileDescriptor_proposer_kv_4bc22ad6c349d68f, []int{10} } func (m *MaxLeaseFooter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -657,7 +657,7 @@ func (m *ClosedTimestampFooter) Reset() { *m = ClosedTimestampFooter{} } func (m *ClosedTimestampFooter) String() string { return proto.CompactTextString(m) } func (*ClosedTimestampFooter) ProtoMessage() {} func (*ClosedTimestampFooter) Descriptor() ([]byte, []int) { - return fileDescriptor_proposer_kv_b3afad4305e873e3, []int{11} + return fileDescriptor_proposer_kv_4bc22ad6c349d68f, []int{11} } func (m *ClosedTimestampFooter) XXX_Unmarshal(b []byte) error { return m.Unmarshal(b) @@ -1154,8 +1154,8 @@ func (m *ReplicatedEvalResult) MarshalTo(dAtA []byte) (int, error) { } dAtA[i] = 0x42 i++ - i = encodeVarintProposerKv(dAtA, i, uint64(m.Timestamp.Size())) - n10, err := m.Timestamp.MarshalTo(dAtA[i:]) + i = encodeVarintProposerKv(dAtA, i, uint64(m.WriteTimestamp.Size())) + n10, err := m.WriteTimestamp.MarshalTo(dAtA[i:]) if err != nil { return 0, err } @@ -1610,7 +1610,7 @@ func (m *ReplicatedEvalResult) Size() (n int) { if m.IsLeaseRequest { n += 2 } - l = m.Timestamp.Size() + l = m.WriteTimestamp.Size() n += 1 + l + sovProposerKv(uint64(l)) if m.DeprecatedDelta != nil { l = m.DeprecatedDelta.Size() @@ -2604,7 +2604,7 @@ func (m *ReplicatedEvalResult) Unmarshal(dAtA []byte) error { m.IsLeaseRequest = bool(v != 0) case 8: if wireType != 2 { - return fmt.Errorf("proto: wrong wireType = %d for field Timestamp", wireType) + return fmt.Errorf("proto: wrong wireType = %d for field WriteTimestamp", wireType) } var msglen int for shift := uint(0); ; shift += 7 { @@ -2628,7 +2628,7 @@ func (m *ReplicatedEvalResult) Unmarshal(dAtA []byte) error { if postIndex > l { return io.ErrUnexpectedEOF } - if err := m.Timestamp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + if err := m.WriteTimestamp.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { return err } iNdEx = postIndex @@ -3785,104 +3785,104 @@ var ( ) func init() { - proto.RegisterFile("kv/kvserver/kvserverpb/proposer_kv.proto", fileDescriptor_proposer_kv_b3afad4305e873e3) -} - -var fileDescriptor_proposer_kv_b3afad4305e873e3 = []byte{ - // 1510 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x5f, 0x6f, 0x13, 0xc7, - 0x16, 0x8f, 0x63, 0x3b, 0x59, 0x8f, 0x13, 0x7b, 0x33, 0x04, 0xd8, 0x9b, 0x7b, 0xaf, 0x1d, 0xb9, - 0x14, 0xa5, 0x94, 0xae, 0x51, 0xd2, 0x4a, 0x88, 0xa2, 0x8a, 0xd8, 0x81, 0x12, 0x93, 0xa4, 0x30, - 0x0e, 0xb4, 0xa2, 0x95, 0x56, 0xe3, 0xdd, 0x61, 0xbd, 0xf5, 0x7a, 0x77, 0x99, 0x19, 0x1b, 0xf2, - 0x29, 0xda, 0x4a, 0x95, 0xda, 0xa7, 0xc2, 0x63, 0x3f, 0x0a, 0x8f, 0x3c, 0xa2, 0x3e, 0x58, 0x25, - 0xbc, 0xf4, 0x33, 0xf0, 0x54, 0xcd, 0xec, 0xac, 0xbd, 0x41, 0xa1, 0x31, 0xf4, 0x6d, 0xf6, 0xcc, - 0x39, 0xbf, 0x33, 0x73, 0xfe, 0xfc, 0xce, 0x2c, 0x58, 0xeb, 0x0d, 0xeb, 0xbd, 0x21, 0x23, 0x74, - 0x48, 0xe8, 0x78, 0x11, 0x75, 0xea, 0x11, 0x0d, 0xa3, 0x90, 0x11, 0x6a, 0xf5, 0x86, 0x66, 0x44, - 0x43, 0x1e, 0xc2, 0xaa, 0x1d, 0xda, 0x3d, 0x1a, 0x62, 0xbb, 0x6b, 0xf6, 0x86, 0x66, 0xa2, 0x6a, - 0x32, 0x1e, 0x52, 0xec, 0x92, 0xa8, 0xb3, 0xb2, 0x24, 0x37, 0xa3, 0x4e, 0x1d, 0x47, 0x5e, 0x6c, - 0xb3, 0x02, 0x13, 0x91, 0x83, 0x39, 0x56, 0xb2, 0x33, 0x89, 0xac, 0x4f, 0x38, 0x4e, 0xc9, 0xff, - 0xab, 0x90, 0xea, 0x24, 0x70, 0xbd, 0x80, 0x08, 0x85, 0xa1, 0x6d, 0xab, 0xcd, 0xff, 0x1d, 0xbb, - 0xb9, 0xa1, 0x76, 0x6b, 0x6f, 0xb9, 0x04, 0xe3, 0x98, 0x13, 0xa5, 0x73, 0x21, 0xad, 0x43, 0x09, - 0x76, 0xd8, 0xa0, 0xdf, 0xc7, 0xf4, 0xa0, 0x4e, 0x99, 0xd0, 0x8c, 0x3f, 0x94, 0xae, 0x31, 0xe0, - 0x9e, 0x5f, 0xef, 0xfa, 0x76, 0x9d, 0x7b, 0x7d, 0xc2, 0x38, 0xee, 0x47, 0x6a, 0x67, 0xd9, 0x0d, - 0xdd, 0x50, 0x2e, 0xeb, 0x62, 0x15, 0x4b, 0x6b, 0xbf, 0x67, 0x40, 0xbe, 0x1d, 0xf9, 0x1e, 0x87, - 0x4d, 0x30, 0xcf, 0xa9, 0xe7, 0xba, 0x84, 0x1a, 0x99, 0xd5, 0xcc, 0x5a, 0x71, 0xbd, 0x6a, 0x4e, - 0xc2, 0xa6, 0x2e, 0x6e, 0x4a, 0xd5, 0xfd, 0x58, 0xad, 0xa1, 0x3d, 0x1b, 0x55, 0x67, 0x9e, 0x8f, - 0xaa, 0x19, 0x94, 0x58, 0xc2, 0x7d, 0x50, 0xa0, 0x5d, 0x66, 0x39, 0xc4, 0xe7, 0xd8, 0x98, 0x95, - 0x30, 0x1f, 0xa6, 0x60, 0x54, 0x28, 0xcc, 0x24, 0x14, 0xe6, 0xee, 0xbd, 0x66, 0xb3, 0xcd, 0x31, - 0x67, 0x0d, 0x5d, 0x80, 0x1d, 0x8e, 0xaa, 0x1a, 0xba, 0xd9, 0xde, 0x12, 0xe6, 0x48, 0xa3, 0x5d, - 0x26, 0x57, 0x57, 0x72, 0x7f, 0x3d, 0xad, 0x66, 0x6a, 0x08, 0xe4, 0x77, 0x09, 0x75, 0xc9, 0x74, - 0x27, 0x95, 0xaa, 0x6f, 0x3f, 0xa9, 0xc2, 0x74, 0x40, 0xa9, 0xd9, 0xc5, 0x81, 0x4b, 0x10, 0x89, - 0x7c, 0xcf, 0xc6, 0x0c, 0xee, 0xbc, 0x09, 0xbe, 0x76, 0x0c, 0xf8, 0x51, 0x9b, 0x7f, 0xf2, 0xf2, - 0xeb, 0xd3, 0xea, 0x4c, 0xed, 0xe5, 0x2c, 0x28, 0x37, 0xc3, 0x7e, 0x34, 0xe0, 0xa4, 0xd9, 0x25, - 0x76, 0x8f, 0x0d, 0xfa, 0xf0, 0x7b, 0x50, 0xb4, 0xd5, 0xda, 0xf2, 0x1c, 0xe9, 0x6b, 0xa1, 0xb1, - 0x2d, 0x10, 0xfe, 0x18, 0x55, 0x37, 0x5c, 0x8f, 0x77, 0x07, 0x1d, 0xd3, 0x0e, 0xfb, 0xf5, 0xb1, - 0x77, 0xa7, 0x33, 0x59, 0xd7, 0xa3, 0x9e, 0x5b, 0x97, 0xa9, 0x1e, 0x0c, 0x3c, 0xc7, 0xbc, 0x7b, - 0x77, 0x7b, 0xeb, 0x70, 0x54, 0x05, 0x09, 0xfa, 0xf6, 0x16, 0x02, 0x09, 0xfa, 0xb6, 0x03, 0x3f, - 0x00, 0x8b, 0x0c, 0x0f, 0x89, 0xc5, 0x02, 0x1c, 0xb1, 0x6e, 0xc8, 0x65, 0x66, 0x34, 0xb4, 0x20, - 0x84, 0x6d, 0x25, 0x83, 0x1b, 0x20, 0xd7, 0x0f, 0x1d, 0x62, 0x64, 0x57, 0x33, 0x6b, 0xa5, 0x63, - 0x43, 0x9a, 0xa0, 0xef, 0x86, 0x0e, 0x41, 0x52, 0x19, 0x56, 0x40, 0xec, 0x27, 0x0a, 0xbd, 0x80, - 0x1b, 0x39, 0x09, 0x9b, 0x92, 0x40, 0x03, 0xcc, 0x0f, 0x09, 0x65, 0x5e, 0x18, 0x18, 0xf9, 0xd5, - 0xcc, 0xda, 0x22, 0x4a, 0x3e, 0xe1, 0x4d, 0x50, 0xe0, 0x84, 0xf6, 0xbd, 0x00, 0x73, 0x62, 0xcc, - 0xad, 0x66, 0xd7, 0x8a, 0xeb, 0xe7, 0x8e, 0xf1, 0xa9, 0x62, 0xbc, 0x45, 0x98, 0x4d, 0xbd, 0x88, - 0x87, 0xb4, 0x91, 0x13, 0x31, 0x42, 0x13, 0x63, 0x95, 0xc9, 0x7b, 0x00, 0x88, 0x10, 0x63, 0x9b, - 0x0b, 0xf4, 0x65, 0x90, 0xef, 0x1c, 0x70, 0xc2, 0x64, 0x5c, 0xb3, 0x28, 0xfe, 0x80, 0x17, 0x01, - 0x64, 0x03, 0xd7, 0x25, 0x8c, 0x13, 0xc7, 0xc2, 0xdc, 0x0a, 0x70, 0x10, 0x32, 0x19, 0x8c, 0x2c, - 0xd2, 0xc7, 0x3b, 0x9b, 0x7c, 0x4f, 0xc8, 0x15, 0xee, 0xcf, 0xb3, 0xe0, 0x54, 0x3b, 0xd9, 0x4a, - 0x79, 0xb8, 0x03, 0x0a, 0x8c, 0x63, 0xca, 0xad, 0x1e, 0x39, 0x50, 0xd9, 0xfb, 0xf4, 0xf5, 0xa8, - 0x7a, 0x69, 0xaa, 0xcc, 0x25, 0xb7, 0xbb, 0x45, 0x0e, 0x90, 0x26, 0x61, 0x6e, 0x91, 0x03, 0xb8, - 0x0b, 0xe6, 0x49, 0xe0, 0x48, 0xc0, 0xd9, 0x7f, 0x01, 0x38, 0x47, 0x02, 0x47, 0xc0, 0xdd, 0x05, - 0xc0, 0x1e, 0x9f, 0x57, 0xa6, 0xb5, 0xb8, 0xfe, 0xb1, 0x79, 0x02, 0x15, 0x9a, 0x93, 0x2b, 0xa6, - 0xea, 0x39, 0x05, 0xa4, 0xc2, 0xf2, 0xa4, 0x00, 0x96, 0x55, 0x6e, 0x38, 0x71, 0xae, 0x0f, 0xb1, - 0x8f, 0x08, 0x1b, 0xf8, 0x82, 0x46, 0xf2, 0x92, 0xbb, 0x54, 0xf7, 0x7f, 0x72, 0xa2, 0x43, 0x85, - 0x22, 0x58, 0x80, 0xa0, 0xd8, 0x16, 0x5e, 0x05, 0x79, 0x26, 0x98, 0x46, 0x9d, 0xfa, 0xfc, 0x89, - 0x20, 0x92, 0x97, 0x50, 0x6c, 0x24, 0xac, 0xfb, 0xa2, 0xfb, 0x65, 0x3d, 0x4e, 0x63, 0x2d, 0xb9, - 0x02, 0xc5, 0x46, 0x70, 0x0d, 0xe8, 0x1e, 0xb3, 0x7c, 0x82, 0x19, 0xb1, 0x28, 0x79, 0x38, 0x20, - 0x8c, 0x1b, 0x73, 0xb2, 0xb0, 0x4b, 0x1e, 0xdb, 0x11, 0x62, 0x14, 0x4b, 0xe1, 0x26, 0x28, 0x8c, - 0x49, 0xd6, 0xd0, 0xa4, 0xaf, 0xff, 0xa7, 0x7c, 0x89, 0xf6, 0x34, 0xbb, 0xbe, 0x6d, 0xee, 0x27, - 0x4a, 0xe3, 0xda, 0x4d, 0x04, 0xf0, 0x36, 0xd0, 0x1d, 0x12, 0x51, 0x22, 0xa3, 0xa8, 0x68, 0x13, - 0xbc, 0x03, 0x6d, 0xa2, 0xf2, 0xc4, 0x5c, 0x72, 0x25, 0xfc, 0x06, 0x94, 0x6d, 0xc9, 0x4e, 0x16, - 0x55, 0xf4, 0x64, 0x2c, 0x48, 0xc0, 0xfa, 0xc9, 0xa9, 0x3f, 0xc2, 0x6a, 0xa8, 0x64, 0x1f, 0x65, - 0xc6, 0x73, 0xa0, 0x44, 0xf1, 0x03, 0x6e, 0xf9, 0xa1, 0xab, 0x4e, 0xba, 0x28, 0x3b, 0x67, 0x41, - 0x48, 0x77, 0x42, 0x37, 0xf6, 0xff, 0x10, 0x14, 0xb1, 0xe3, 0x58, 0x8c, 0x71, 0xdc, 0xf1, 0x89, - 0xb1, 0x24, 0x7d, 0x5f, 0x9b, 0xb6, 0x0a, 0x8e, 0xd4, 0x92, 0xb9, 0xe9, 0x38, 0xed, 0xf6, 0xbe, - 0xc0, 0x69, 0x94, 0x04, 0xbd, 0x4d, 0xbe, 0x11, 0xc0, 0x8e, 0xd3, 0x8e, 0x7d, 0xc0, 0x1b, 0x20, - 0x1f, 0x9f, 0x07, 0x4a, 0x67, 0x17, 0xa6, 0x8a, 0x9c, 0x3c, 0xad, 0x4a, 0x48, 0x6c, 0x0e, 0x7f, - 0xc8, 0x80, 0x53, 0x11, 0x25, 0x43, 0x95, 0xfc, 0xf8, 0x1d, 0x81, 0x7d, 0x63, 0x79, 0x9a, 0xd4, - 0x5e, 0x7b, 0x3d, 0xaa, 0x5e, 0x9d, 0x9e, 0xb6, 0x85, 0x71, 0xd3, 0x0f, 0xed, 0xde, 0x18, 0x01, - 0x2d, 0x09, 0xdf, 0xb2, 0xc0, 0x6e, 0x2b, 0xcf, 0xf0, 0x5b, 0xa0, 0xdb, 0xf1, 0xdc, 0xb0, 0x12, - 0x3a, 0x37, 0x4e, 0xcb, 0xd3, 0x5c, 0x9a, 0xaa, 0x91, 0x53, 0x03, 0x07, 0x95, 0xed, 0x37, 0x26, - 0xd0, 0x77, 0x00, 0x46, 0xd4, 0x0b, 0xa9, 0x25, 0x9e, 0x14, 0x96, 0x7a, 0x46, 0x18, 0x67, 0x24, - 0xbc, 0xf9, 0x16, 0xf8, 0xd4, 0xeb, 0xc3, 0x44, 0x04, 0x3b, 0xed, 0x78, 0x8d, 0x74, 0x89, 0x94, - 0x92, 0xac, 0x7c, 0x09, 0x52, 0xe9, 0x82, 0x10, 0xe4, 0xc4, 0x7b, 0x29, 0x26, 0x4a, 0x24, 0xd7, - 0xb0, 0x0a, 0xf2, 0x36, 0xb5, 0x37, 0xd6, 0x25, 0x53, 0x2c, 0x36, 0x0a, 0x87, 0xa3, 0x6a, 0xbe, - 0x89, 0x9a, 0x1b, 0xeb, 0x28, 0x96, 0xc7, 0x4c, 0xd3, 0xca, 0x69, 0x19, 0x7d, 0xb6, 0x95, 0xd3, - 0xf2, 0xfa, 0x5c, 0x2b, 0xa7, 0xcd, 0xeb, 0x5a, 0x2b, 0xa7, 0x15, 0x74, 0xd0, 0xca, 0x69, 0x25, - 0xbd, 0xdc, 0xca, 0x69, 0x65, 0x5d, 0x6f, 0xe5, 0x34, 0x5d, 0x5f, 0x6a, 0xe5, 0xb4, 0x53, 0xfa, - 0x72, 0x6b, 0x4e, 0xfb, 0x69, 0x4f, 0xff, 0x6d, 0xaf, 0xb6, 0x0a, 0xc0, 0xd7, 0xd4, 0xe3, 0xa4, - 0x81, 0xb9, 0xdd, 0x3d, 0xee, 0x00, 0xb5, 0x3b, 0x60, 0x61, 0x27, 0x74, 0x3d, 0x1b, 0xfb, 0x5f, - 0x45, 0x3b, 0xa1, 0x0b, 0x37, 0x41, 0x36, 0x8c, 0xc4, 0xc8, 0x10, 0xc3, 0xe8, 0xa3, 0x93, 0xaa, - 0x68, 0x6c, 0xaa, 0x8a, 0x48, 0xd8, 0xd6, 0x7e, 0x99, 0x03, 0x45, 0x84, 0x1f, 0xf0, 0x66, 0xd8, - 0xef, 0xe3, 0xc0, 0x81, 0xe7, 0x41, 0xb9, 0x8f, 0x1f, 0xab, 0x82, 0xf2, 0x02, 0x87, 0x3c, 0x96, - 0xa4, 0x94, 0x43, 0x8b, 0x7d, 0xfc, 0x58, 0xe6, 0x7a, 0x5b, 0x08, 0xe1, 0x3e, 0xf8, 0x4f, 0x8a, - 0x07, 0xc6, 0x2f, 0x58, 0x69, 0x27, 0x27, 0x67, 0x71, 0xdd, 0x38, 0x66, 0x3a, 0xc6, 0x74, 0x74, - 0x76, 0x62, 0x7a, 0x5b, 0x59, 0xca, 0x0d, 0x38, 0x04, 0x67, 0x8f, 0x42, 0x59, 0x4c, 0x50, 0x57, - 0x60, 0x13, 0xc9, 0x68, 0xd9, 0xc6, 0x17, 0xaf, 0x47, 0xd5, 0x2b, 0xef, 0x34, 0x60, 0x24, 0x70, - 0x5b, 0xa1, 0xa0, 0xd3, 0x51, 0xda, 0x5f, 0x22, 0x86, 0x0f, 0xc1, 0x19, 0x3a, 0xee, 0x67, 0x8b, - 0x0c, 0xb1, 0x6f, 0x51, 0xd9, 0xd1, 0x92, 0x31, 0x8a, 0xeb, 0x9f, 0xbd, 0x17, 0x1d, 0xa8, 0x38, - 0x2f, 0xd3, 0xe3, 0xc6, 0xce, 0x0e, 0x28, 0x3e, 0x12, 0xd9, 0xb6, 0x3a, 0x22, 0xdd, 0x46, 0x69, - 0xca, 0x69, 0x37, 0xa9, 0x10, 0x04, 0x1e, 0x4d, 0xaa, 0xa5, 0x0d, 0x4a, 0x7e, 0x9c, 0x5e, 0x2b, - 0x8c, 0x04, 0xe1, 0x19, 0xe5, 0x29, 0xa7, 0x59, 0xba, 0xa0, 0xd0, 0x82, 0x9f, 0x2e, 0xaf, 0xfb, - 0x00, 0x70, 0x8a, 0x6d, 0x62, 0xc9, 0x42, 0xd4, 0x65, 0x95, 0x7d, 0x7e, 0x72, 0x24, 0x26, 0xd5, - 0x64, 0xee, 0x0b, 0xf3, 0x2d, 0xcc, 0xf1, 0xf5, 0x80, 0xd3, 0x03, 0x54, 0xe0, 0xc9, 0x37, 0xbc, - 0x09, 0x74, 0xdb, 0x0f, 0x19, 0x71, 0xac, 0xc9, 0x44, 0x5a, 0x9a, 0x82, 0xb6, 0x50, 0x39, 0x36, - 0x1b, 0x0b, 0x56, 0xae, 0x82, 0xd2, 0x51, 0x37, 0x50, 0x07, 0xd9, 0xe4, 0x8d, 0x53, 0x40, 0x62, - 0x29, 0x5e, 0x57, 0x43, 0xec, 0x0f, 0xe2, 0x19, 0x5f, 0x40, 0xf1, 0xc7, 0x95, 0xd9, 0xcb, 0xa2, - 0x59, 0xb3, 0x7a, 0x6e, 0xdc, 0xb2, 0xb3, 0x7a, 0x36, 0x6e, 0xc7, 0x27, 0x7b, 0xb5, 0xcb, 0xa0, - 0xb4, 0xab, 0x4a, 0xfe, 0x46, 0x18, 0x72, 0x42, 0xa7, 0xed, 0x8d, 0x9a, 0x0b, 0x4e, 0x37, 0x8f, - 0x1e, 0x52, 0x01, 0xec, 0xbd, 0xe7, 0xa5, 0x55, 0x21, 0xbd, 0x79, 0xf5, 0xc6, 0xc5, 0x67, 0x2f, - 0x2b, 0x33, 0xcf, 0x0e, 0x2b, 0x99, 0xe7, 0x87, 0x95, 0xcc, 0x8b, 0xc3, 0x4a, 0xe6, 0xcf, 0xc3, - 0x4a, 0xe6, 0xc7, 0x57, 0x95, 0x99, 0xe7, 0xaf, 0x2a, 0x33, 0x2f, 0x5e, 0x55, 0x66, 0xee, 0x83, - 0xc9, 0x1f, 0x5a, 0x67, 0x4e, 0xfe, 0x40, 0x6d, 0xfc, 0x1d, 0x00, 0x00, 0xff, 0xff, 0x25, 0x40, - 0x71, 0x9a, 0x87, 0x0e, 0x00, 0x00, + proto.RegisterFile("kv/kvserver/kvserverpb/proposer_kv.proto", fileDescriptor_proposer_kv_4bc22ad6c349d68f) +} + +var fileDescriptor_proposer_kv_4bc22ad6c349d68f = []byte{ + // 1513 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xa4, 0x57, 0x4f, 0x6f, 0x13, 0x47, + 0x14, 0x8f, 0x63, 0x3b, 0x59, 0x8f, 0x13, 0x7b, 0x33, 0x04, 0xd8, 0xa6, 0xad, 0x1d, 0xb9, 0x14, + 0xa5, 0x94, 0xae, 0x51, 0xd2, 0x4a, 0x88, 0xa2, 0x0a, 0xec, 0x40, 0x89, 0x49, 0x52, 0x18, 0x07, + 0x5a, 0xd1, 0x4a, 0xab, 0xf1, 0xee, 0xb0, 0xde, 0x7a, 0xbd, 0xbb, 0xcc, 0x8c, 0x0d, 0xf9, 0x14, + 0x6d, 0xa5, 0x4a, 0xed, 0xa9, 0xe5, 0x58, 0xf5, 0x93, 0x70, 0xe4, 0x88, 0x7a, 0xb0, 0x4a, 0xb8, + 0xf4, 0x33, 0x70, 0xaa, 0x66, 0x76, 0xd6, 0xde, 0xa0, 0xd0, 0x18, 0x7a, 0x9b, 0x7d, 0xf3, 0xde, + 0xef, 0xcd, 0xbc, 0x3f, 0xbf, 0x37, 0x0b, 0xd6, 0x7a, 0xc3, 0x7a, 0x6f, 0xc8, 0x08, 0x1d, 0x12, + 0x3a, 0x5e, 0x44, 0x9d, 0x7a, 0x44, 0xc3, 0x28, 0x64, 0x84, 0x5a, 0xbd, 0xa1, 0x19, 0xd1, 0x90, + 0x87, 0xb0, 0x6a, 0x87, 0x76, 0x8f, 0x86, 0xd8, 0xee, 0x9a, 0xbd, 0xa1, 0x99, 0xa8, 0x9a, 0x8c, + 0x87, 0x14, 0xbb, 0x24, 0xea, 0xac, 0x2c, 0xc9, 0xcd, 0xa8, 0x53, 0xc7, 0x91, 0x17, 0xdb, 0xac, + 0xc0, 0x44, 0xe4, 0x60, 0x8e, 0x95, 0xec, 0x54, 0x22, 0xeb, 0x13, 0x8e, 0x53, 0xf2, 0x77, 0x15, + 0x52, 0x9d, 0x04, 0xae, 0x17, 0x10, 0xa1, 0x30, 0xb4, 0x6d, 0xb5, 0xf9, 0xde, 0x91, 0x9b, 0x1b, + 0x6a, 0xb7, 0xf6, 0x9a, 0x4b, 0x30, 0x8e, 0x39, 0x51, 0x3a, 0xe7, 0xd2, 0x3a, 0x94, 0x60, 0x87, + 0x0d, 0xfa, 0x7d, 0x4c, 0xf7, 0xeb, 0x94, 0x09, 0xcd, 0xf8, 0x43, 0xe9, 0x1a, 0x03, 0xee, 0xf9, + 0xf5, 0xae, 0x6f, 0xd7, 0xb9, 0xd7, 0x27, 0x8c, 0xe3, 0x7e, 0xa4, 0x76, 0x96, 0xdd, 0xd0, 0x0d, + 0xe5, 0xb2, 0x2e, 0x56, 0xb1, 0xb4, 0xf6, 0x47, 0x06, 0xe4, 0xdb, 0x91, 0xef, 0x71, 0xd8, 0x04, + 0xf3, 0x9c, 0x7a, 0xae, 0x4b, 0xa8, 0x91, 0x59, 0xcd, 0xac, 0x15, 0xd7, 0xab, 0xe6, 0x24, 0x6c, + 0xea, 0xe2, 0xa6, 0x54, 0xdd, 0x8b, 0xd5, 0x1a, 0xda, 0x93, 0x51, 0x75, 0xe6, 0xe9, 0xa8, 0x9a, + 0x41, 0x89, 0x25, 0xdc, 0x03, 0x05, 0xda, 0x65, 0x96, 0x43, 0x7c, 0x8e, 0x8d, 0x59, 0x09, 0xf3, + 0x61, 0x0a, 0x46, 0x85, 0xc2, 0x4c, 0x42, 0x61, 0xee, 0xdc, 0x6d, 0x36, 0xdb, 0x1c, 0x73, 0xd6, + 0xd0, 0x05, 0xd8, 0xc1, 0xa8, 0xaa, 0xa1, 0x1b, 0xed, 0x4d, 0x61, 0x8e, 0x34, 0xda, 0x65, 0x72, + 0x75, 0x29, 0xf7, 0xcf, 0xe3, 0x6a, 0xa6, 0x86, 0x40, 0x7e, 0x87, 0x50, 0x97, 0x4c, 0x77, 0x52, + 0xa9, 0xfa, 0xfa, 0x93, 0x2a, 0x4c, 0x07, 0x94, 0x9a, 0x5d, 0x1c, 0xb8, 0x04, 0x91, 0xc8, 0xf7, + 0x6c, 0xcc, 0xe0, 0xf6, 0xab, 0xe0, 0x6b, 0x47, 0x80, 0x1f, 0xb6, 0xf9, 0x2f, 0x2f, 0xbf, 0x3e, + 0xae, 0xce, 0xd4, 0x9e, 0xcf, 0x82, 0x72, 0x33, 0xec, 0x47, 0x03, 0x4e, 0x9a, 0x5d, 0x62, 0xf7, + 0xd8, 0xa0, 0x0f, 0xbf, 0x07, 0x45, 0x5b, 0xad, 0x2d, 0xcf, 0x91, 0xbe, 0x16, 0x1a, 0x5b, 0x02, + 0xe1, 0xaf, 0x51, 0x75, 0xc3, 0xf5, 0x78, 0x77, 0xd0, 0x31, 0xed, 0xb0, 0x5f, 0x1f, 0x7b, 0x77, + 0x3a, 0x93, 0x75, 0x3d, 0xea, 0xb9, 0x75, 0x99, 0xea, 0xc1, 0xc0, 0x73, 0xcc, 0x3b, 0x77, 0xb6, + 0x36, 0x0f, 0x46, 0x55, 0x90, 0xa0, 0x6f, 0x6d, 0x22, 0x90, 0xa0, 0x6f, 0x39, 0xf0, 0x03, 0xb0, + 0xc8, 0xf0, 0x90, 0x58, 0x2c, 0xc0, 0x11, 0xeb, 0x86, 0x5c, 0x66, 0x46, 0x43, 0x0b, 0x42, 0xd8, + 0x56, 0x32, 0xb8, 0x01, 0x72, 0xfd, 0xd0, 0x21, 0x46, 0x76, 0x35, 0xb3, 0x56, 0x3a, 0x32, 0xa4, + 0x09, 0xfa, 0x4e, 0xe8, 0x10, 0x24, 0x95, 0x61, 0x05, 0xc4, 0x7e, 0xa2, 0xd0, 0x0b, 0xb8, 0x91, + 0x93, 0xb0, 0x29, 0x09, 0x34, 0xc0, 0xfc, 0x90, 0x50, 0xe6, 0x85, 0x81, 0x91, 0x5f, 0xcd, 0xac, + 0x2d, 0xa2, 0xe4, 0x13, 0xde, 0x00, 0x05, 0x4e, 0x68, 0xdf, 0x0b, 0x30, 0x27, 0xc6, 0xdc, 0x6a, + 0x76, 0xad, 0xb8, 0x7e, 0xe6, 0x08, 0x9f, 0x2a, 0xc6, 0x9b, 0x84, 0xd9, 0xd4, 0x8b, 0x78, 0x48, + 0x1b, 0x39, 0x11, 0x23, 0x34, 0x31, 0x56, 0x99, 0xbc, 0x0b, 0x80, 0x08, 0x31, 0xb6, 0xb9, 0x40, + 0x5f, 0x06, 0xf9, 0xce, 0x3e, 0x27, 0x4c, 0xc6, 0x35, 0x8b, 0xe2, 0x0f, 0x78, 0x1e, 0x40, 0x36, + 0x70, 0x5d, 0xc2, 0x38, 0x71, 0x2c, 0xcc, 0xad, 0x00, 0x07, 0x21, 0x93, 0xc1, 0xc8, 0x22, 0x7d, + 0xbc, 0x73, 0x95, 0xef, 0x0a, 0xb9, 0xc2, 0xfd, 0x79, 0x16, 0x9c, 0x68, 0x27, 0x5b, 0x29, 0x0f, + 0xb7, 0x41, 0x81, 0x71, 0x4c, 0xb9, 0xd5, 0x23, 0xfb, 0x2a, 0x7b, 0x9f, 0xbe, 0x1c, 0x55, 0x2f, + 0x4c, 0x95, 0xb9, 0xe4, 0x76, 0x37, 0xc9, 0x3e, 0xd2, 0x24, 0xcc, 0x4d, 0xb2, 0x0f, 0x77, 0xc0, + 0x3c, 0x09, 0x1c, 0x09, 0x38, 0xfb, 0x3f, 0x00, 0xe7, 0x48, 0xe0, 0x08, 0xb8, 0x3b, 0x00, 0xd8, + 0xe3, 0xf3, 0xca, 0xb4, 0x16, 0xd7, 0x3f, 0x36, 0x8f, 0xa1, 0x42, 0x73, 0x72, 0xc5, 0x54, 0x3d, + 0xa7, 0x80, 0x54, 0x58, 0xfe, 0x2c, 0x80, 0x65, 0x95, 0x1b, 0x4e, 0x9c, 0x6b, 0x43, 0xec, 0x23, + 0xc2, 0x06, 0xbe, 0xa0, 0x91, 0xbc, 0xe4, 0x2e, 0xd5, 0xfd, 0x9f, 0x1c, 0xeb, 0x50, 0xa1, 0x08, + 0x16, 0x20, 0x28, 0xb6, 0x85, 0x97, 0x41, 0x9e, 0x09, 0xa6, 0x51, 0xa7, 0x3e, 0x7b, 0x2c, 0x88, + 0xe4, 0x25, 0x14, 0x1b, 0x09, 0xeb, 0xbe, 0xe8, 0x7e, 0x59, 0x8f, 0xd3, 0x58, 0x4b, 0xae, 0x40, + 0xb1, 0x11, 0x5c, 0x03, 0xba, 0xc7, 0x2c, 0x9f, 0x60, 0x46, 0x2c, 0x4a, 0x1e, 0x0c, 0x08, 0xe3, + 0xc6, 0x9c, 0x2c, 0xec, 0x92, 0xc7, 0xb6, 0x85, 0x18, 0xc5, 0x52, 0xb8, 0x0d, 0xca, 0x0f, 0xa9, + 0xc7, 0x89, 0x35, 0xa6, 0x5a, 0x43, 0x93, 0x1e, 0xdf, 0x4f, 0x79, 0x14, 0x4d, 0x6a, 0x76, 0x7d, + 0xdb, 0xdc, 0x4b, 0x94, 0x54, 0x05, 0x97, 0xa4, 0xed, 0x58, 0x0a, 0x6f, 0x01, 0xdd, 0x21, 0x11, + 0x25, 0x32, 0xa0, 0x8a, 0x41, 0xc1, 0x1b, 0x30, 0x28, 0x2a, 0x4f, 0xcc, 0x25, 0x6d, 0xc2, 0x6f, + 0x40, 0xd9, 0x96, 0x44, 0x65, 0x51, 0xc5, 0x54, 0xc6, 0x82, 0x04, 0xac, 0x1f, 0x5f, 0x05, 0x87, + 0x08, 0x0e, 0x95, 0xec, 0xc3, 0x24, 0x79, 0x06, 0x94, 0x28, 0xbe, 0xcf, 0x2d, 0x3f, 0x74, 0xd5, + 0x49, 0x17, 0x65, 0x13, 0x2d, 0x08, 0xe9, 0x76, 0xe8, 0xc6, 0xfe, 0x1f, 0x80, 0x22, 0x76, 0x1c, + 0x8b, 0x31, 0x8e, 0x3b, 0x3e, 0x31, 0x96, 0xa4, 0xef, 0x2b, 0xd3, 0x16, 0xc4, 0xa1, 0xb2, 0x32, + 0xaf, 0x3a, 0x4e, 0xbb, 0xbd, 0x27, 0x70, 0x1a, 0x25, 0xc1, 0x74, 0x93, 0x6f, 0x04, 0xb0, 0xe3, + 0xb4, 0x63, 0x1f, 0xf0, 0x3a, 0xc8, 0xc7, 0xe7, 0x81, 0xd2, 0xd9, 0xb9, 0xa9, 0x22, 0x27, 0x4f, + 0xab, 0xb2, 0x12, 0x9b, 0xc3, 0x1f, 0x32, 0xe0, 0x44, 0x44, 0xc9, 0x50, 0xd5, 0x41, 0xfc, 0xa4, + 0xc0, 0xbe, 0xb1, 0x3c, 0x4d, 0x7e, 0xaf, 0xbc, 0x1c, 0x55, 0x2f, 0x4f, 0xcf, 0xe0, 0xc2, 0xb8, + 0xe9, 0x87, 0x76, 0x6f, 0x8c, 0x80, 0x96, 0x84, 0x6f, 0x59, 0x6b, 0xb7, 0x94, 0x67, 0xf8, 0x2d, + 0xd0, 0xed, 0x78, 0x84, 0x58, 0x09, 0xb3, 0x1b, 0x27, 0xe5, 0x69, 0x2e, 0x4c, 0xd5, 0xd3, 0xa9, + 0xd9, 0x83, 0xca, 0xf6, 0x2b, 0xc3, 0xe8, 0x3b, 0x00, 0x23, 0xea, 0x85, 0xd4, 0x12, 0xaf, 0x0b, + 0x4b, 0xbd, 0x28, 0x8c, 0x53, 0x12, 0xde, 0x7c, 0x0d, 0x7c, 0xea, 0x21, 0x62, 0x22, 0x82, 0x9d, + 0x76, 0xbc, 0x46, 0xba, 0x44, 0x4a, 0x49, 0x56, 0xbe, 0x04, 0xa9, 0x74, 0x41, 0x08, 0x72, 0xe2, + 0xe9, 0x14, 0x73, 0x26, 0x92, 0x6b, 0x58, 0x05, 0x79, 0x9b, 0xda, 0x1b, 0xeb, 0x92, 0x34, 0x16, + 0x1b, 0x85, 0x83, 0x51, 0x35, 0xdf, 0x44, 0xcd, 0x8d, 0x75, 0x14, 0xcb, 0x63, 0xd2, 0x69, 0xe5, + 0xb4, 0x8c, 0x3e, 0xdb, 0xca, 0x69, 0x79, 0x7d, 0xae, 0x95, 0xd3, 0xe6, 0x75, 0xad, 0x95, 0xd3, + 0x0a, 0x3a, 0x68, 0xe5, 0xb4, 0x92, 0x5e, 0x6e, 0xe5, 0xb4, 0xb2, 0xae, 0xb7, 0x72, 0x9a, 0xae, + 0x2f, 0xb5, 0x72, 0xda, 0x09, 0x7d, 0xb9, 0x35, 0xa7, 0xfd, 0xb4, 0xab, 0xff, 0xb6, 0x5b, 0x5b, + 0x05, 0xe0, 0x6b, 0xd1, 0x6c, 0x0d, 0xcc, 0xed, 0xee, 0x51, 0x07, 0xa8, 0xdd, 0x06, 0x0b, 0xdb, + 0xa1, 0xeb, 0xd9, 0xd8, 0xff, 0x2a, 0xda, 0x0e, 0x5d, 0x78, 0x15, 0x64, 0xc3, 0x48, 0x4c, 0x0f, + 0x31, 0x97, 0x3e, 0x3a, 0xae, 0x8a, 0xc6, 0xa6, 0xaa, 0x88, 0x84, 0x6d, 0xed, 0x97, 0x39, 0x50, + 0x44, 0xf8, 0x3e, 0x6f, 0x86, 0xfd, 0x3e, 0x0e, 0x1c, 0x78, 0x16, 0x94, 0xfb, 0xf8, 0x91, 0x2a, + 0x28, 0x2f, 0x70, 0xc8, 0x23, 0xc9, 0x4f, 0x39, 0xb4, 0xd8, 0xc7, 0x8f, 0x64, 0xae, 0xb7, 0x84, + 0x10, 0xee, 0x81, 0x77, 0x52, 0x3c, 0x30, 0x7e, 0xcc, 0x4a, 0x3b, 0x39, 0x44, 0x8b, 0xeb, 0xc6, + 0x11, 0x83, 0x32, 0x66, 0xa6, 0xd3, 0x13, 0xd3, 0x5b, 0xca, 0x52, 0x6e, 0xc0, 0x21, 0x38, 0x7d, + 0x18, 0xca, 0x62, 0x82, 0xc5, 0x02, 0x9b, 0x48, 0x72, 0xcb, 0x36, 0xbe, 0x78, 0x39, 0xaa, 0x5e, + 0x7a, 0xa3, 0x59, 0x23, 0x81, 0xdb, 0x0a, 0x05, 0x9d, 0x8c, 0xd2, 0xfe, 0x12, 0x31, 0x7c, 0x00, + 0x4e, 0xd1, 0x71, 0x3f, 0x5b, 0x64, 0x88, 0x7d, 0x8b, 0xca, 0x8e, 0x96, 0x8c, 0x51, 0x5c, 0xff, + 0xec, 0xad, 0xe8, 0x40, 0xc5, 0x79, 0x99, 0x1e, 0x35, 0x81, 0xb6, 0x41, 0x31, 0xa6, 0xe5, 0x8e, + 0x48, 0xb7, 0x51, 0x9a, 0x72, 0xf0, 0x4d, 0x2a, 0x04, 0x81, 0x87, 0x93, 0x6a, 0x69, 0x83, 0x92, + 0x1f, 0xa7, 0xd7, 0x0a, 0x23, 0x41, 0x78, 0x46, 0x79, 0xca, 0xc1, 0x96, 0x2e, 0x28, 0xb4, 0xe0, + 0xa7, 0xcb, 0xeb, 0x1e, 0x00, 0x9c, 0x62, 0x9b, 0x58, 0xb2, 0x10, 0x75, 0x59, 0x65, 0x9f, 0x1f, + 0x1f, 0x89, 0x49, 0x35, 0x99, 0x7b, 0xc2, 0x7c, 0x13, 0x73, 0x7c, 0x2d, 0xe0, 0x74, 0x1f, 0x15, + 0x78, 0xf2, 0x0d, 0x6f, 0x00, 0xdd, 0xf6, 0x43, 0x46, 0x9c, 0xd4, 0x58, 0x5a, 0x9a, 0x82, 0xb6, + 0x50, 0x39, 0x36, 0x1b, 0x0b, 0x56, 0x2e, 0x83, 0xd2, 0x61, 0x37, 0x50, 0x07, 0xd9, 0xe4, 0xb9, + 0x53, 0x40, 0x62, 0x29, 0x1e, 0x5a, 0x43, 0xec, 0x0f, 0xe2, 0x71, 0x5f, 0x40, 0xf1, 0xc7, 0xa5, + 0xd9, 0x8b, 0xa2, 0x59, 0xb3, 0x7a, 0x6e, 0xdc, 0xb2, 0xb3, 0x7a, 0x36, 0x6e, 0xc7, 0xdf, 0x77, + 0x6b, 0x17, 0x41, 0x69, 0x47, 0x95, 0xfc, 0xf5, 0x30, 0xe4, 0x84, 0x4e, 0xdb, 0x1b, 0x35, 0x17, + 0x9c, 0x6c, 0x1e, 0x3e, 0xa4, 0x02, 0xd8, 0x7d, 0xcb, 0x4b, 0xab, 0x42, 0x7a, 0xf5, 0xea, 0x8d, + 0xf3, 0x4f, 0x9e, 0x57, 0x66, 0x9e, 0x1c, 0x54, 0x32, 0x4f, 0x0f, 0x2a, 0x99, 0x67, 0x07, 0x95, + 0xcc, 0xdf, 0x07, 0x95, 0xcc, 0x8f, 0x2f, 0x2a, 0x33, 0x4f, 0x5f, 0x54, 0x66, 0x9e, 0xbd, 0xa8, + 0xcc, 0xdc, 0x03, 0x93, 0x9f, 0xb5, 0xce, 0x9c, 0xfc, 0x97, 0xda, 0xf8, 0x37, 0x00, 0x00, 0xff, + 0xff, 0xc4, 0x44, 0xd7, 0x40, 0x92, 0x0e, 0x00, 0x00, } diff --git a/pkg/kv/kvserver/kvserverpb/proposer_kv.proto b/pkg/kv/kvserver/kvserverpb/proposer_kv.proto index dbc8a20fd232..d6a72965ffa2 100644 --- a/pkg/kv/kvserver/kvserverpb/proposer_kv.proto +++ b/pkg/kv/kvserver/kvserverpb/proposer_kv.proto @@ -125,10 +125,10 @@ message ReplicatedEvalResult { Merge merge = 4; ComputeChecksum compute_checksum = 21; bool is_lease_request = 6; - // The BatchRequest.Timestamp of the request that produced this command. Used - // to verify the validity of the command against the GC threshold and to - // update the followers' clocks. - util.hlc.Timestamp timestamp = 8 [(gogoproto.nullable) = false]; + // The timestamp at which this command is writing. Used to verify the validity + // of the command against the GC threshold and to update the followers' + // clocks. + util.hlc.Timestamp write_timestamp = 8 [(gogoproto.nullable) = false]; // The stats delta corresponding to the data in this WriteBatch. On // a split, contains only the contributions to the left-hand side. storage.enginepb.MVCCStats deprecated_delta = 10; // See #18828 diff --git a/pkg/kv/kvserver/replica.go b/pkg/kv/kvserver/replica.go index 865175233bb4..334829e18677 100644 --- a/pkg/kv/kvserver/replica.go +++ b/pkg/kv/kvserver/replica.go @@ -1348,8 +1348,8 @@ func (r *Replica) checkSpanInRangeRLocked(ctx context.Context, rspan roachpb.RSp ) } -// checkTSAboveGCThresholdRLocked returns an error if a request (identified -// by its MVCC timestamp) can be run on the replica. +// checkTSAboveGCThresholdRLocked returns an error if a request (identified by +// its read timestamp) wants to read below the range's GC threshold. func (r *Replica) checkTSAboveGCThresholdRLocked( ts hlc.Timestamp, st kvserverpb.LeaseStatus, isAdmin bool, ) error { diff --git a/pkg/kv/kvserver/replica_application_result.go b/pkg/kv/kvserver/replica_application_result.go index 1d212e8d9c24..c86f35ab5fa7 100644 --- a/pkg/kv/kvserver/replica_application_result.go +++ b/pkg/kv/kvserver/replica_application_result.go @@ -67,7 +67,7 @@ func isTrivial(r *kvserverpb.ReplicatedEvalResult) bool { // it is trivial. allowlist := *r allowlist.Delta = enginepb.MVCCStatsDelta{} - allowlist.Timestamp = hlc.Timestamp{} + allowlist.WriteTimestamp = hlc.Timestamp{} allowlist.DeprecatedDelta = nil allowlist.PrevLeaseProposal = nil allowlist.State = nil @@ -85,7 +85,7 @@ func clearTrivialReplicatedEvalResultFields(r *kvserverpb.ReplicatedEvalResult) // they don't trigger an assertion at the end of the application process // (which checks that all fields were handled). r.IsLeaseRequest = false - r.Timestamp = hlc.Timestamp{} + r.WriteTimestamp = hlc.Timestamp{} r.PrevLeaseProposal = nil // The state fields cleared here were already applied to the in-memory view of // replica state for this batch. diff --git a/pkg/kv/kvserver/replica_application_state_machine.go b/pkg/kv/kvserver/replica_application_state_machine.go index 2aa5acb0f544..7ff541f5df8e 100644 --- a/pkg/kv/kvserver/replica_application_state_machine.go +++ b/pkg/kv/kvserver/replica_application_state_machine.go @@ -318,16 +318,19 @@ func checkForcedErr( ) } - // Verify that the batch timestamp is after the GC threshold. This is + // Verify that command is not trying to write below the GC threshold. This is // necessary because not all commands declare read access on the GC // threshold key, even though they implicitly depend on it. This means // that access to this state will not be serialized by latching, // so we must perform this check upstream and downstream of raft. - // See #14833. - ts := raftCmd.ReplicatedEvalResult.Timestamp - if ts.LessEq(*replicaState.GCThreshold) { + // TODO(andrei,nvanbenschoten,bdarnell): Is this check below-Raft actually + // necessary, given that we've check at evaluation time that the request + // evaluates at a timestamp above the GC threshold? Does it actually matter if + // the GC threshold has advanced since then? + wts := raftCmd.ReplicatedEvalResult.WriteTimestamp + if wts.LessEq(*replicaState.GCThreshold) { return leaseIndex, proposalNoReevaluation, roachpb.NewError(&roachpb.BatchTimestampBeforeGCError{ - Timestamp: ts, + Timestamp: wts, Threshold: *replicaState.GCThreshold, }) } @@ -484,7 +487,7 @@ func (b *replicaAppBatch) Stage(cmdI apply.Command) (apply.CheckedCommand, error } // Update the batch's max timestamp. - if clockTS, ok := cmd.replicatedResult().Timestamp.TryToClockTimestamp(); ok { + if clockTS, ok := cmd.replicatedResult().WriteTimestamp.TryToClockTimestamp(); ok { b.maxTS.Forward(clockTS) } diff --git a/pkg/kv/kvserver/replica_application_state_machine_test.go b/pkg/kv/kvserver/replica_application_state_machine_test.go index c64225c03ec7..11d2c1b04f21 100644 --- a/pkg/kv/kvserver/replica_application_state_machine_test.go +++ b/pkg/kv/kvserver/replica_application_state_machine_test.go @@ -123,7 +123,7 @@ func TestReplicaStateMachineChangeReplicas(t *testing.T) { ReplicatedEvalResult: kvserverpb.ReplicatedEvalResult{ State: &kvserverpb.ReplicaState{Desc: &newDesc}, ChangeReplicas: &kvserverpb.ChangeReplicas{ChangeReplicasTrigger: trigger}, - Timestamp: r.mu.state.GCThreshold.Add(1, 0), + WriteTimestamp: r.mu.state.GCThreshold.Add(1, 0), }, }, confChange: &decodedConfChange{ diff --git a/pkg/kv/kvserver/replica_proposal.go b/pkg/kv/kvserver/replica_proposal.go index 9a84295451cb..cfa692ef384e 100644 --- a/pkg/kv/kvserver/replica_proposal.go +++ b/pkg/kv/kvserver/replica_proposal.go @@ -748,6 +748,10 @@ func (r *Replica) evaluateProposal( // Evaluate the commands. If this returns without an error, the batch should // be committed. Note that we don't hold any locks at this point. This is // important since evaluating a proposal is expensive. + // + // Note that, during evaluation, ba's read and write timestamps might get + // bumped (see evaluateWriteBatchWithServersideRefreshes). + // // TODO(tschottdorf): absorb all returned values in `res` below this point // in the call stack as well. batch, ms, br, res, pErr := r.evaluateWriteBatch(ctx, idKey, ba, lul, latchSpans) @@ -804,7 +808,7 @@ func (r *Replica) evaluateProposal( // Set the proposal's replicated result, which contains metadata and // side-effects that are to be replicated to all replicas. res.Replicated.IsLeaseRequest = ba.IsLeaseRequest() - res.Replicated.Timestamp = ba.Timestamp + res.Replicated.WriteTimestamp = ba.WriteTimestamp() res.Replicated.Delta = ms.ToStatsDelta() // This is the result of a migration. See the field for more details.