diff --git a/pkg/resource_manager/resource_manager.pb.go b/pkg/resource_manager/resource_manager.pb.go index 8423faa1ac..e1b5573229 100644 --- a/pkg/resource_manager/resource_manager.pb.go +++ b/pkg/resource_manager/resource_manager.pb.go @@ -715,7 +715,8 @@ type TokenBucketRequest struct { // *TokenBucketRequest_RuItems // *TokenBucketRequest_RawResourceItems Request isTokenBucketRequest_Request `protobuf_oneof:"request"` - // Aggregate statistics in group level. + // Actual resource usage in group level since the last token bucket request. + // This field is used for resource group stats and metering. ConsumptionSinceLastRequest *Consumption `protobuf:"bytes,4,opt,name=consumption_since_last_request,json=consumptionSinceLastRequest,proto3" json:"consumption_since_last_request,omitempty"` // label background request. IsBackground bool `protobuf:"varint,5,opt,name=is_background,json=isBackground,proto3" json:"is_background,omitempty"` @@ -726,6 +727,9 @@ type TokenBucketRequest struct { // - If the keyspace ID is set to a valid value, it will try to request the token bucket from // the resource group within the given keyspace ID. KeyspaceId *KeyspaceIDValue `protobuf:"bytes,7,opt,name=keyspace_id,json=keyspaceId,proto3" json:"keyspace_id,omitempty"` + // Signed token settlement in group level since the last token bucket request. + // RRU/WRU may be negative to report refunds. This field must not be used for metering. + SettlementSinceLastRequest *Consumption `protobuf:"bytes,8,opt,name=settlement_since_last_request,json=settlementSinceLastRequest,proto3" json:"settlement_since_last_request,omitempty"` } func (m *TokenBucketRequest) Reset() { *m = TokenBucketRequest{} } @@ -833,6 +837,13 @@ func (m *TokenBucketRequest) GetKeyspaceId() *KeyspaceIDValue { return nil } +func (m *TokenBucketRequest) GetSettlementSinceLastRequest() *Consumption { + if m != nil { + return m.SettlementSinceLastRequest + } + return nil +} + // XXX_OneofWrappers is for the internal use of the proto package. func (*TokenBucketRequest) XXX_OneofWrappers() []interface{} { return []interface{}{ @@ -2147,136 +2158,137 @@ func init() { func init() { proto.RegisterFile("resource_manager.proto", fileDescriptor_7048dd9233ee965d) } var fileDescriptor_7048dd9233ee965d = []byte{ - // 2051 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcb, 0x73, 0x1b, 0x49, - 0x19, 0xd7, 0xe8, 0x65, 0xe9, 0x93, 0xf5, 0x70, 0xdb, 0xd9, 0x68, 0x15, 0xe2, 0x24, 0xb3, 0x6c, - 0x70, 0x1c, 0xd6, 0xd9, 0x35, 0xec, 0x9a, 0x2a, 0x28, 0x6a, 0xfd, 0x08, 0x59, 0x13, 0x3b, 0xeb, - 0x6a, 0x5b, 0xbb, 0x27, 0x32, 0x8c, 0x46, 0x6d, 0xa5, 0xa3, 0xd1, 0x8c, 0xdc, 0xd3, 0x63, 0x45, - 0x39, 0x51, 0x05, 0x07, 0x0a, 0x2e, 0x7b, 0xe4, 0x4f, 0xe0, 0xc0, 0x01, 0xae, 0x50, 0x54, 0x71, - 0xa0, 0x0a, 0x8e, 0x7b, 0xdc, 0x1b, 0x54, 0xf2, 0x8f, 0x50, 0xfd, 0x98, 0xd1, 0xc8, 0x92, 0x6c, - 0xc7, 0x95, 0x62, 0x6f, 0x9a, 0xef, 0xfb, 0x7d, 0x8f, 0xfe, 0xfa, 0x7b, 0x74, 0xb7, 0xe0, 0x1d, - 0x46, 0x02, 0x3f, 0x64, 0x0e, 0xb1, 0x7a, 0xb6, 0x67, 0x77, 0x08, 0x5b, 0xeb, 0x33, 0x9f, 0xfb, - 0xa8, 0x76, 0x96, 0xde, 0x58, 0xea, 0xf8, 0x1d, 0x5f, 0x32, 0x1f, 0x88, 0x5f, 0x0a, 0xd7, 0xa8, - 0xb2, 0x30, 0xe0, 0xf2, 0xa7, 0x22, 0x98, 0xdf, 0x83, 0xea, 0x63, 0x32, 0x0c, 0xfa, 0xb6, 0x43, - 0x76, 0x77, 0xbe, 0xb0, 0xdd, 0x90, 0xa0, 0x25, 0xc8, 0x9d, 0x8a, 0x1f, 0x75, 0xe3, 0xb6, 0xb1, - 0x52, 0xc6, 0xea, 0xc3, 0xfc, 0xb5, 0x01, 0xef, 0xee, 0xd1, 0x80, 0x63, 0x6d, 0xe8, 0x11, 0xf3, - 0xc3, 0x7e, 0x80, 0xc9, 0x49, 0x48, 0x02, 0x8e, 0x4c, 0x28, 0x0f, 0x28, 0x7f, 0x66, 0xb1, 0xd0, - 0x0a, 0xb8, 0xcd, 0x03, 0x29, 0x5b, 0xc0, 0x25, 0x41, 0xc4, 0xe1, 0xa1, 0x20, 0xa1, 0x2d, 0x28, - 0x75, 0xb5, 0x29, 0x8b, 0xb6, 0xeb, 0xe9, 0xdb, 0xc6, 0x4a, 0x69, 0xfd, 0xce, 0xda, 0xc4, 0x8a, - 0xce, 0xf8, 0x83, 0x21, 0x92, 0xda, 0x6d, 0x9b, 0xbf, 0x31, 0xa0, 0x31, 0xcd, 0x8b, 0xa0, 0xef, - 0x7b, 0x01, 0x41, 0x1f, 0x40, 0x8e, 0x30, 0xe6, 0x33, 0x69, 0xbe, 0xb4, 0x7e, 0x7d, 0x52, 0xf9, - 0x43, 0xc1, 0xc6, 0x0a, 0x85, 0x36, 0x20, 0xdf, 0x91, 0x0a, 0xea, 0xe9, 0xdb, 0x99, 0x95, 0xd2, - 0xfa, 0xad, 0x49, 0xfc, 0x98, 0x21, 0xac, 0xe1, 0xe6, 0x5f, 0x0c, 0xb8, 0xfe, 0x88, 0x8c, 0x7b, - 0x11, 0x85, 0x62, 0x0d, 0x16, 0x63, 0x2d, 0x12, 0x6e, 0x79, 0x76, 0x4f, 0x05, 0xb3, 0x88, 0x17, - 0x58, 0x52, 0xe4, 0x89, 0xdd, 0x23, 0x93, 0xa1, 0x4b, 0x5f, 0x18, 0xba, 0xcc, 0x55, 0x42, 0xf7, - 0x2b, 0x03, 0xea, 0x93, 0x3e, 0x5f, 0x2d, 0x70, 0x1f, 0x43, 0x4e, 0x2e, 0x4d, 0x6f, 0xe2, 0x85, - 0x71, 0x53, 0x68, 0xf3, 0x2b, 0x03, 0x1a, 0x3b, 0xc4, 0x25, 0x9c, 0xbc, 0x95, 0xc8, 0xbd, 0x8d, - 0x84, 0xfa, 0x25, 0xdc, 0x98, 0xea, 0xd1, 0xd5, 0xe2, 0x82, 0x20, 0xdb, 0xf2, 0xdb, 0x43, 0xe9, - 0x4a, 0x11, 0xcb, 0xdf, 0xe6, 0x01, 0x5c, 0x3f, 0x08, 0xa7, 0xa7, 0x4a, 0x1c, 0x46, 0xe3, 0x8d, - 0xc2, 0xf8, 0x0b, 0xa8, 0x4f, 0x6a, 0x7c, 0x7b, 0x0e, 0xff, 0xd5, 0x80, 0xc5, 0x23, 0xbf, 0x4b, - 0xbc, 0xad, 0xd0, 0xe9, 0x12, 0x1e, 0xd7, 0xf8, 0xa7, 0x50, 0x60, 0xea, 0xa7, 0x28, 0x6f, 0x51, - 0x2f, 0xdf, 0x9d, 0xd4, 0x9e, 0x10, 0xd4, 0x72, 0x38, 0x96, 0x42, 0x1b, 0x50, 0xe7, 0x36, 0xeb, - 0x10, 0x6e, 0x69, 0x92, 0xd5, 0x27, 0x8c, 0xfa, 0x6d, 0xab, 0xa7, 0xb2, 0x3e, 0x8b, 0xaf, 0x29, - 0xbe, 0x16, 0x3d, 0x90, 0xdc, 0xfd, 0x00, 0xad, 0x40, 0xcd, 0x71, 0x29, 0xf1, 0xb8, 0x15, 0x7a, - 0xf4, 0x24, 0x8c, 0x8b, 0x20, 0x8b, 0x2b, 0x8a, 0xde, 0x94, 0xe4, 0xdd, 0xb6, 0xf9, 0xa7, 0x1c, - 0xa0, 0x49, 0x1f, 0xde, 0x38, 0xb5, 0x1e, 0x43, 0x81, 0x85, 0x16, 0xe5, 0x44, 0x7b, 0x56, 0x5a, - 0x5f, 0xbb, 0xcc, 0x5a, 0xd7, 0xa2, 0x35, 0x37, 0x3f, 0x4b, 0xe1, 0x39, 0x16, 0xee, 0x0a, 0x05, - 0xa8, 0x03, 0x88, 0xd9, 0x03, 0x2b, 0x96, 0x57, 0x6a, 0x55, 0x11, 0x6f, 0xbc, 0x91, 0x5a, 0x7b, - 0x10, 0xed, 0xfa, 0x67, 0x29, 0x5c, 0x63, 0xa3, 0x4f, 0x65, 0xa8, 0x05, 0xcb, 0x8e, 0xef, 0x05, - 0x61, 0xaf, 0xcf, 0xa9, 0xef, 0x59, 0x01, 0xf5, 0x1c, 0x62, 0xb9, 0x76, 0x10, 0xc7, 0xbb, 0x9e, - 0x95, 0x46, 0x6f, 0x4e, 0x1a, 0xdd, 0x1e, 0xc9, 0xe1, 0x1b, 0x09, 0x25, 0x87, 0x42, 0xc7, 0x9e, - 0x1d, 0xc4, 0x91, 0x7c, 0x0f, 0xca, 0x34, 0xb0, 0x5a, 0xb6, 0xd3, 0x15, 0x71, 0xf4, 0xda, 0xf5, - 0x9c, 0x6c, 0x57, 0xf3, 0x34, 0xd8, 0x8a, 0x69, 0xe8, 0x26, 0x00, 0x0d, 0x2c, 0x4e, 0x8f, 0x5d, - 0x3b, 0x78, 0x56, 0xcf, 0x4b, 0x44, 0x91, 0x06, 0x47, 0x8a, 0x70, 0xb6, 0x70, 0xe7, 0xae, 0x50, - 0xb8, 0x8d, 0x27, 0x50, 0x8c, 0x83, 0x8d, 0x36, 0xa1, 0x14, 0x65, 0x14, 0xb3, 0x42, 0x9d, 0x9d, - 0x77, 0xa6, 0x95, 0x93, 0x04, 0x35, 0x3d, 0xca, 0x45, 0xc4, 0x70, 0x91, 0x45, 0x2a, 0x1a, 0x14, - 0xd0, 0x64, 0x94, 0xd1, 0x21, 0x2c, 0xc5, 0x8a, 0x13, 0x5b, 0x78, 0x8e, 0x85, 0xf1, 0x3d, 0xc1, - 0x88, 0x4d, 0x28, 0xdd, 0x2a, 0xc2, 0x9c, 0xa6, 0x9a, 0xbf, 0x33, 0x60, 0x69, 0xbc, 0xd6, 0xae, - 0x56, 0xc7, 0xdb, 0x50, 0x64, 0x5a, 0x34, 0x1a, 0x66, 0xef, 0x5f, 0x90, 0x59, 0x0a, 0x8d, 0x47, - 0x72, 0xe6, 0xbf, 0xd2, 0x63, 0x85, 0x1f, 0xfb, 0xf2, 0xa6, 0xc5, 0x73, 0x08, 0xa8, 0xc3, 0x6c, - 0x8f, 0x93, 0xb6, 0xd8, 0x0d, 0x8b, 0x0b, 0x95, 0x91, 0x57, 0x77, 0x27, 0xbd, 0x7a, 0xa4, 0xb0, - 0xb8, 0x99, 0xb4, 0x5d, 0xed, 0x8c, 0x51, 0x45, 0x11, 0x5d, 0x8f, 0x95, 0x46, 0x1a, 0xb4, 0xe6, - 0x8c, 0xd4, 0xfc, 0x60, 0xb6, 0xe6, 0x51, 0xec, 0x93, 0x26, 0xae, 0x45, 0x26, 0x92, 0xbc, 0x89, - 0x59, 0x9b, 0xbd, 0xca, 0x54, 0xf9, 0x9b, 0x01, 0x4b, 0xd3, 0x96, 0x85, 0x3e, 0x86, 0x2c, 0x1f, - 0xf6, 0x55, 0xec, 0x2a, 0x17, 0x64, 0xe8, 0xd1, 0xb0, 0x4f, 0xb0, 0x84, 0xa3, 0x1d, 0xa8, 0x44, - 0x8b, 0x8f, 0xa3, 0x39, 0xa3, 0x90, 0x93, 0x2b, 0x2c, 0x6b, 0x21, 0xbd, 0xb2, 0xbb, 0x50, 0xe5, - 0x8c, 0x3a, 0x5d, 0x97, 0x58, 0x9c, 0xf6, 0x88, 0xa5, 0x9b, 0x50, 0x06, 0x97, 0x35, 0xf9, 0x88, - 0xf6, 0xc8, 0x7e, 0x60, 0xfe, 0xd3, 0x80, 0x9b, 0xe7, 0x86, 0xee, 0x12, 0xcb, 0x48, 0xc8, 0x7d, - 0x5b, 0xcb, 0xf8, 0x7d, 0x16, 0x4a, 0x89, 0xb6, 0x86, 0x10, 0xe4, 0x98, 0x6e, 0x0f, 0xc6, 0x8a, - 0x81, 0x33, 0x0c, 0x37, 0x05, 0x6d, 0x20, 0x69, 0x69, 0x45, 0x1b, 0xe0, 0xa6, 0x68, 0x5e, 0x8c, - 0xd8, 0x6d, 0xab, 0x35, 0xe4, 0x44, 0xa9, 0x36, 0x44, 0x95, 0xd8, 0xed, 0x2d, 0x41, 0x40, 0xb7, - 0xa0, 0x34, 0x60, 0x94, 0x13, 0xcd, 0xcf, 0x4a, 0x3e, 0x48, 0x92, 0x02, 0xdc, 0x83, 0x05, 0xee, - 0x73, 0xdb, 0xb5, 0x9c, 0x7e, 0x18, 0x7b, 0x98, 0x93, 0xb0, 0x8a, 0x64, 0x6c, 0xf7, 0x43, 0xe5, - 0x22, 0xfa, 0x10, 0xae, 0x05, 0x27, 0xae, 0xe5, 0xda, 0x43, 0xc2, 0xc6, 0xe0, 0x79, 0x09, 0x5f, - 0x08, 0x4e, 0xdc, 0x3d, 0xc1, 0x1b, 0x49, 0xdc, 0x83, 0x85, 0xee, 0xa9, 0x25, 0xfd, 0x63, 0x7d, - 0xc7, 0x72, 0xfc, 0xd0, 0xe3, 0xb2, 0x81, 0x1a, 0xb8, 0xd2, 0x3d, 0xc5, 0xc4, 0x6e, 0xe3, 0xbe, - 0xb3, 0x2d, 0xa8, 0xe8, 0x3e, 0xa0, 0xee, 0xa9, 0xa5, 0x7c, 0x1d, 0x61, 0x0b, 0x12, 0x5b, 0xed, - 0x9e, 0x7e, 0x29, 0x18, 0x31, 0xf8, 0x27, 0x70, 0x43, 0x2a, 0x75, 0x98, 0x1f, 0x04, 0x96, 0xfd, - 0xd2, 0xe2, 0xcc, 0x3e, 0x3e, 0xa6, 0x8e, 0x5e, 0x65, 0x51, 0x0e, 0xdb, 0xeb, 0x02, 0xb2, 0x2d, - 0x10, 0x9b, 0x2f, 0x8f, 0x14, 0x5f, 0x2d, 0xf9, 0xa7, 0xf0, 0x1d, 0x65, 0x67, 0x86, 0x38, 0x48, - 0xf1, 0xba, 0xc4, 0x4c, 0x93, 0xbf, 0x09, 0x25, 0x4e, 0xc5, 0xba, 0xac, 0xd0, 0x3a, 0x5d, 0xaf, - 0x97, 0xa4, 0x8f, 0x05, 0x41, 0xc2, 0xcd, 0x2f, 0xd6, 0x15, 0xbb, 0xdd, 0x8a, 0xd8, 0xf3, 0x11, - 0xbb, 0xdd, 0x92, 0xec, 0xf7, 0xa0, 0xa2, 0x47, 0x4d, 0x84, 0x28, 0x4b, 0x44, 0x49, 0x53, 0x05, - 0xc8, 0x7c, 0x0a, 0xd5, 0x33, 0xdd, 0xff, 0xaa, 0xc5, 0x18, 0xdf, 0x8f, 0x54, 0xce, 0xe8, 0xfb, - 0x91, 0xd0, 0x3f, 0xde, 0xfb, 0xaf, 0x5a, 0x25, 0xd3, 0xf5, 0xff, 0x23, 0x0b, 0xe5, 0xb1, 0x23, - 0x9f, 0x38, 0xbb, 0x25, 0xfa, 0xb0, 0xfc, 0x8d, 0x1e, 0x40, 0xb6, 0xe7, 0xb7, 0x95, 0x68, 0x65, - 0xfd, 0xc6, 0xb4, 0x96, 0xe8, 0x87, 0xfd, 0x7d, 0xbf, 0x4d, 0xb0, 0x04, 0xa2, 0x3d, 0x98, 0x17, - 0x31, 0x0b, 0x08, 0xe7, 0xd4, 0xeb, 0x44, 0xa7, 0x92, 0xd5, 0x19, 0x82, 0x89, 0x80, 0x1c, 0x6a, - 0x09, 0x0c, 0xac, 0x19, 0xfd, 0x46, 0x4f, 0xe1, 0xda, 0xd8, 0x49, 0x27, 0x56, 0x9b, 0x3d, 0x5f, - 0xed, 0x28, 0x0e, 0xb1, 0xda, 0x45, 0x36, 0x49, 0x44, 0x0d, 0x28, 0xf4, 0x19, 0xf5, 0x19, 0xe5, - 0x43, 0x59, 0x51, 0x65, 0x1c, 0x7f, 0xa3, 0x3d, 0xa8, 0xb1, 0xd0, 0xb3, 0x07, 0xf6, 0x70, 0x64, - 0x36, 0x3f, 0xab, 0x79, 0x63, 0x85, 0x8c, 0xad, 0x55, 0xd9, 0x38, 0x01, 0x35, 0x61, 0x71, 0x74, - 0xc6, 0x19, 0x29, 0x54, 0x47, 0x95, 0x29, 0xe7, 0xde, 0xd1, 0xe1, 0x27, 0xd6, 0x89, 0x5a, 0x13, - 0x34, 0xb4, 0x01, 0x73, 0xb8, 0x29, 0xef, 0x74, 0xb2, 0x10, 0x2f, 0x3c, 0x8a, 0x45, 0xe8, 0xb3, - 0x53, 0xa9, 0x78, 0x95, 0xa9, 0xf4, 0x73, 0xa8, 0xcf, 0xda, 0x45, 0xb4, 0x06, 0x99, 0xa8, 0x35, - 0x5e, 0xd8, 0x8f, 0xd3, 0xac, 0x69, 0xfe, 0xdd, 0x88, 0x94, 0x4d, 0xd9, 0xa6, 0x07, 0x90, 0x71, - 0xfa, 0x97, 0x54, 0x26, 0x90, 0xe8, 0x13, 0x98, 0xa3, 0xbe, 0xec, 0x6a, 0x97, 0x9b, 0x08, 0x79, - 0xea, 0x8b, 0x56, 0x87, 0x7e, 0x04, 0x05, 0xea, 0xab, 0x16, 0xa7, 0x33, 0xf7, 0x02, 0xc1, 0x39, - 0xea, 0xcb, 0xbe, 0x67, 0x76, 0xa0, 0x94, 0x1c, 0x68, 0x9f, 0x42, 0x21, 0xde, 0x63, 0x63, 0xd6, - 0x1e, 0x4b, 0x81, 0x3d, 0xda, 0x4b, 0x24, 0x7f, 0x2c, 0x85, 0xde, 0x81, 0x7c, 0x62, 0xa6, 0x19, - 0x58, 0x7f, 0x99, 0x27, 0xfa, 0x3e, 0x32, 0x26, 0x87, 0x6e, 0x40, 0xf1, 0x98, 0xba, 0xae, 0xc5, - 0x6c, 0xae, 0x0a, 0x38, 0x8b, 0x0b, 0x82, 0x80, 0x6d, 0x4e, 0xc4, 0x84, 0x69, 0x85, 0x2c, 0xe0, - 0x96, 0x2b, 0x64, 0xa4, 0xbe, 0x0c, 0x06, 0x49, 0x92, 0x5a, 0xc4, 0x84, 0xea, 0xd9, 0x2f, 0x46, - 0xc7, 0x1f, 0x39, 0xa1, 0x7a, 0xf6, 0x0b, 0x35, 0x20, 0xcd, 0x3b, 0x90, 0x93, 0x87, 0x43, 0x54, - 0x87, 0xb9, 0x1e, 0x09, 0x02, 0xbb, 0x13, 0x35, 0x89, 0xe8, 0xd3, 0xfc, 0xad, 0x01, 0x25, 0x5d, - 0x03, 0x38, 0x74, 0x45, 0xdf, 0x58, 0x22, 0x2f, 0x88, 0x63, 0x11, 0xd7, 0xee, 0x07, 0x62, 0x3c, - 0xeb, 0x39, 0xa4, 0x5c, 0x5b, 0x10, 0xbc, 0x87, 0x8a, 0xa5, 0xe7, 0xd0, 0xfb, 0x50, 0xe9, 0x33, - 0xdf, 0x21, 0x81, 0x40, 0x8b, 0x1c, 0xd3, 0x6e, 0x96, 0x63, 0xaa, 0xc8, 0x44, 0x74, 0x07, 0xe6, - 0xa3, 0xf3, 0x73, 0xe8, 0x51, 0xae, 0x07, 0x75, 0x74, 0x58, 0x17, 0x19, 0x68, 0x9e, 0xc2, 0xbc, - 0xf6, 0xe4, 0x4b, 0x9b, 0x3b, 0xcf, 0xc4, 0x69, 0x53, 0x5c, 0x59, 0xa8, 0xd7, 0xb1, 0xda, 0x21, - 0xb3, 0xe5, 0x4d, 0x46, 0x7b, 0x92, 0xc1, 0x0b, 0x9a, 0xb5, 0xa3, 0x39, 0xfb, 0x01, 0xfa, 0x44, - 0x77, 0x59, 0xd5, 0xf2, 0xcc, 0x99, 0xb5, 0x2e, 0xb5, 0x8f, 0xda, 0xac, 0xf9, 0x1f, 0x03, 0xaa, - 0x67, 0xda, 0x00, 0xfa, 0x08, 0xb2, 0x2c, 0x74, 0xc9, 0xec, 0xcc, 0x4d, 0xc4, 0x0c, 0x4b, 0x28, - 0xda, 0x80, 0xbc, 0xed, 0x08, 0x57, 0xb4, 0x03, 0xb7, 0x66, 0x0a, 0x6d, 0x4a, 0x18, 0xd6, 0x70, - 0xf4, 0x43, 0xc8, 0x0d, 0x84, 0x4b, 0x3a, 0x71, 0x97, 0xcf, 0x77, 0x1c, 0x2b, 0x30, 0x5a, 0x85, - 0x85, 0x60, 0x40, 0xb9, 0xf3, 0x2c, 0x79, 0x12, 0xcf, 0xca, 0xcd, 0xad, 0x2a, 0x46, 0x7c, 0x0e, - 0x37, 0x9f, 0x02, 0x9a, 0x6c, 0x4b, 0x22, 0xf5, 0x9e, 0xfb, 0x2d, 0x4b, 0xc4, 0x40, 0xdd, 0xe3, - 0x8b, 0xb8, 0xf0, 0xdc, 0x6f, 0x89, 0xc8, 0x04, 0xe8, 0x3e, 0x2c, 0x84, 0x9c, 0xba, 0xf4, 0xa5, - 0x8a, 0xfb, 0x28, 0x01, 0xb3, 0xb8, 0x96, 0x60, 0xc8, 0x34, 0x34, 0x31, 0x94, 0x0e, 0x6c, 0xc6, - 0xa9, 0x43, 0xfb, 0xb6, 0xc7, 0xa7, 0xce, 0xa3, 0x0a, 0xa4, 0xf5, 0xcb, 0x4c, 0x16, 0xa7, 0x69, - 0x5b, 0xa4, 0xb6, 0x4b, 0x03, 0x4e, 0x3c, 0x2b, 0x64, 0xae, 0x3a, 0xb9, 0x17, 0x31, 0x28, 0x52, - 0x93, 0xb9, 0xc1, 0xea, 0xbb, 0x63, 0x63, 0x5a, 0x38, 0x85, 0xf2, 0x90, 0xc6, 0xcd, 0x5a, 0x6a, - 0xf5, 0xc7, 0x63, 0x13, 0x56, 0xb2, 0xe6, 0x20, 0xb3, 0x7d, 0xd0, 0xac, 0xa5, 0x50, 0x05, 0x60, - 0xf7, 0x73, 0xd1, 0x12, 0x7e, 0xe6, 0xfa, 0x83, 0x9a, 0x81, 0xaa, 0x50, 0xda, 0xfd, 0x5c, 0x56, - 0xba, 0x24, 0xa4, 0x57, 0x3f, 0x82, 0x62, 0x3c, 0xfa, 0x50, 0x09, 0xe6, 0x9a, 0x5e, 0xd7, 0xf3, - 0x07, 0x5e, 0x2d, 0x85, 0x00, 0xf2, 0xb8, 0x29, 0xc8, 0x35, 0x43, 0x30, 0xb0, 0x3d, 0x90, 0x1f, - 0xe9, 0xd5, 0x23, 0x28, 0x8f, 0xed, 0x9c, 0x30, 0xf2, 0xc4, 0xf7, 0x88, 0xfa, 0x52, 0x92, 0x3b, - 0x6c, 0x88, 0x43, 0xaf, 0x66, 0xa0, 0x79, 0x28, 0x6c, 0xfb, 0xbe, 0xbb, 0x23, 0x74, 0xa6, 0x51, - 0x01, 0xb2, 0x8f, 0xa9, 0xeb, 0xd6, 0x32, 0xc2, 0x91, 0xc3, 0xd1, 0xb6, 0xd4, 0xb2, 0xab, 0xdb, - 0x50, 0x3b, 0x9b, 0x90, 0xa8, 0x0c, 0x45, 0xa1, 0x58, 0x12, 0x6a, 0x29, 0x54, 0x84, 0xdc, 0xc3, - 0x17, 0xb6, 0xc3, 0x95, 0x43, 0x87, 0xb4, 0x47, 0x5d, 0x9b, 0x29, 0xad, 0x07, 0xae, 0xed, 0xd5, - 0x32, 0xeb, 0x7f, 0xce, 0x89, 0x30, 0xa9, 0x40, 0xec, 0xab, 0x6c, 0x41, 0x27, 0x80, 0x26, 0x5f, - 0x46, 0xd1, 0xfd, 0xc9, 0xb4, 0x9a, 0xf9, 0x8a, 0xdb, 0xf8, 0xfe, 0xe5, 0xc0, 0xea, 0x5a, 0x68, - 0xa6, 0x50, 0x17, 0x6a, 0x67, 0x5f, 0x14, 0xd1, 0xbd, 0x29, 0x33, 0x7e, 0xfa, 0x4b, 0x69, 0x63, - 0xf5, 0x32, 0xd0, 0xa4, 0xb1, 0xcd, 0x76, 0xfb, 0x42, 0x63, 0x33, 0xde, 0xda, 0xa6, 0x19, 0x9b, - 0xf5, 0x88, 0x66, 0xa6, 0x90, 0x07, 0x8b, 0xfb, 0x7e, 0x9b, 0x1e, 0x0f, 0xff, 0x4f, 0xf6, 0x38, - 0x2c, 0x4e, 0x79, 0x86, 0x44, 0x53, 0x36, 0x64, 0xf6, 0xfb, 0x69, 0xe3, 0x83, 0x4b, 0xa2, 0x63, - 0xab, 0xcf, 0x61, 0x71, 0xd3, 0x39, 0x09, 0x29, 0x4b, 0x5e, 0xee, 0x02, 0x74, 0xfe, 0xcb, 0x41, - 0x9c, 0x2d, 0x77, 0x2f, 0x82, 0x45, 0x76, 0x56, 0x8c, 0x0f, 0x8d, 0xad, 0xdb, 0xdf, 0xfc, 0xb1, - 0x60, 0xfc, 0xfb, 0xd5, 0xb2, 0xf1, 0xf5, 0xab, 0x65, 0xe3, 0xbf, 0xaf, 0x96, 0x8d, 0xaf, 0x5e, - 0x2f, 0xa7, 0xfe, 0xf0, 0x7a, 0x39, 0xf5, 0xf5, 0xeb, 0xe5, 0xd4, 0x37, 0xaf, 0x97, 0x53, 0xad, - 0xbc, 0xfc, 0x47, 0xe2, 0x07, 0xff, 0x0b, 0x00, 0x00, 0xff, 0xff, 0x26, 0x12, 0xd4, 0x8e, 0xe4, - 0x18, 0x00, 0x00, + // 2071 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xc4, 0x59, 0xcb, 0x6f, 0x1b, 0xc7, + 0x19, 0xe7, 0xf2, 0x25, 0xf2, 0xa3, 0xf8, 0xd0, 0x48, 0x8e, 0x19, 0xba, 0x96, 0xed, 0x4d, 0xe3, + 0xca, 0x72, 0x23, 0x27, 0x6a, 0x13, 0x15, 0x68, 0x51, 0x44, 0x0f, 0xd7, 0x51, 0x2d, 0x39, 0xc2, + 0x48, 0x4c, 0x4e, 0xf5, 0x66, 0xb9, 0x1c, 0xd1, 0x63, 0x2e, 0x77, 0xa9, 0xd9, 0x59, 0xd1, 0xf4, + 0xa9, 0x40, 0x7b, 0x28, 0x5a, 0xa0, 0xc8, 0xb1, 0x7f, 0x42, 0x8f, 0xed, 0xb5, 0x45, 0x81, 0x1e, + 0x0a, 0xb4, 0xc7, 0x1c, 0x73, 0x6b, 0x61, 0xff, 0x23, 0xc5, 0x3c, 0x76, 0xb9, 0x14, 0x49, 0x49, + 0x16, 0x8c, 0xf6, 0xc6, 0xfd, 0x1e, 0xbf, 0xef, 0x9b, 0x6f, 0xbe, 0xc7, 0xcc, 0x10, 0xde, 0x61, + 0x24, 0xf0, 0x43, 0xe6, 0x10, 0xab, 0x67, 0x7b, 0x76, 0x87, 0xb0, 0xb5, 0x3e, 0xf3, 0xb9, 0x8f, + 0x6a, 0x67, 0xe9, 0x8d, 0xa5, 0x8e, 0xdf, 0xf1, 0x25, 0xf3, 0x81, 0xf8, 0xa5, 0xe4, 0x1a, 0x55, + 0x16, 0x06, 0x5c, 0xfe, 0x54, 0x04, 0xf3, 0x7b, 0x50, 0x7d, 0x4c, 0x86, 0x41, 0xdf, 0x76, 0xc8, + 0xee, 0xce, 0x17, 0xb6, 0x1b, 0x12, 0xb4, 0x04, 0xb9, 0x53, 0xf1, 0xa3, 0x6e, 0xdc, 0x36, 0x56, + 0xca, 0x58, 0x7d, 0x98, 0xbf, 0x32, 0xe0, 0xdd, 0x3d, 0x1a, 0x70, 0xac, 0x0d, 0x3d, 0x62, 0x7e, + 0xd8, 0x0f, 0x30, 0x39, 0x09, 0x49, 0xc0, 0x91, 0x09, 0xe5, 0x01, 0xe5, 0xcf, 0x2c, 0x16, 0x5a, + 0x01, 0xb7, 0x79, 0x20, 0x75, 0x0b, 0xb8, 0x24, 0x88, 0x38, 0x3c, 0x14, 0x24, 0xb4, 0x05, 0xa5, + 0xae, 0x36, 0x65, 0xd1, 0x76, 0x3d, 0x7d, 0xdb, 0x58, 0x29, 0xad, 0xdf, 0x59, 0x9b, 0x58, 0xd1, + 0x19, 0x7f, 0x30, 0x44, 0x5a, 0xbb, 0x6d, 0xf3, 0xd7, 0x06, 0x34, 0xa6, 0x79, 0x11, 0xf4, 0x7d, + 0x2f, 0x20, 0xe8, 0x03, 0xc8, 0x11, 0xc6, 0x7c, 0x26, 0xcd, 0x97, 0xd6, 0xaf, 0x4f, 0x82, 0x3f, + 0x14, 0x6c, 0xac, 0xa4, 0xd0, 0x06, 0xe4, 0x3b, 0x12, 0xa0, 0x9e, 0xbe, 0x9d, 0x59, 0x29, 0xad, + 0xdf, 0x9a, 0x94, 0x1f, 0x33, 0x84, 0xb5, 0xb8, 0xf9, 0x67, 0x03, 0xae, 0x3f, 0x22, 0xe3, 0x5e, + 0x44, 0xa1, 0x58, 0x83, 0xc5, 0x18, 0x45, 0x8a, 0x5b, 0x9e, 0xdd, 0x53, 0xc1, 0x2c, 0xe2, 0x05, + 0x96, 0x54, 0x79, 0x62, 0xf7, 0xc8, 0x64, 0xe8, 0xd2, 0x17, 0x86, 0x2e, 0x73, 0x95, 0xd0, 0xfd, + 0xd2, 0x80, 0xfa, 0xa4, 0xcf, 0x57, 0x0b, 0xdc, 0xc7, 0x90, 0x93, 0x4b, 0xd3, 0x9b, 0x78, 0x61, + 0xdc, 0x94, 0xb4, 0xf9, 0xb5, 0x01, 0x8d, 0x1d, 0xe2, 0x12, 0x4e, 0xde, 0x4a, 0xe4, 0xde, 0x46, + 0x42, 0x7d, 0x05, 0x37, 0xa6, 0x7a, 0x74, 0xb5, 0xb8, 0x20, 0xc8, 0xb6, 0xfc, 0xf6, 0x50, 0xba, + 0x52, 0xc4, 0xf2, 0xb7, 0x79, 0x00, 0xd7, 0x0f, 0xc2, 0xe9, 0xa9, 0x12, 0x87, 0xd1, 0x78, 0xa3, + 0x30, 0xfe, 0x02, 0xea, 0x93, 0x88, 0x6f, 0xcf, 0xe1, 0xbf, 0x18, 0xb0, 0x78, 0xe4, 0x77, 0x89, + 0xb7, 0x15, 0x3a, 0x5d, 0xc2, 0xe3, 0x1a, 0xff, 0x14, 0x0a, 0x4c, 0xfd, 0x14, 0xe5, 0x2d, 0xea, + 0xe5, 0xbb, 0x93, 0xe8, 0x09, 0x45, 0xad, 0x87, 0x63, 0x2d, 0xb4, 0x01, 0x75, 0x6e, 0xb3, 0x0e, + 0xe1, 0x96, 0x26, 0x59, 0x7d, 0xc2, 0xa8, 0xdf, 0xb6, 0x7a, 0x2a, 0xeb, 0xb3, 0xf8, 0x9a, 0xe2, + 0x6b, 0xd5, 0x03, 0xc9, 0xdd, 0x0f, 0xd0, 0x0a, 0xd4, 0x1c, 0x97, 0x12, 0x8f, 0x5b, 0xa1, 0x47, + 0x4f, 0xc2, 0xb8, 0x08, 0xb2, 0xb8, 0xa2, 0xe8, 0x4d, 0x49, 0xde, 0x6d, 0x9b, 0xbf, 0xcf, 0x03, + 0x9a, 0xf4, 0xe1, 0x8d, 0x53, 0xeb, 0x31, 0x14, 0x58, 0x68, 0x51, 0x4e, 0xb4, 0x67, 0xa5, 0xf5, + 0xb5, 0xcb, 0xac, 0x75, 0x2d, 0x5a, 0x73, 0xf3, 0xb3, 0x14, 0x9e, 0x63, 0xe1, 0xae, 0x00, 0x40, + 0x1d, 0x40, 0xcc, 0x1e, 0x58, 0xb1, 0xbe, 0x82, 0x55, 0x45, 0xbc, 0xf1, 0x46, 0xb0, 0xf6, 0x20, + 0xda, 0xf5, 0xcf, 0x52, 0xb8, 0xc6, 0x46, 0x9f, 0xca, 0x50, 0x0b, 0x96, 0x1d, 0xdf, 0x0b, 0xc2, + 0x5e, 0x9f, 0x53, 0xdf, 0xb3, 0x02, 0xea, 0x39, 0xc4, 0x72, 0xed, 0x20, 0x8e, 0x77, 0x3d, 0x2b, + 0x8d, 0xde, 0x9c, 0x34, 0xba, 0x3d, 0xd2, 0xc3, 0x37, 0x12, 0x20, 0x87, 0x02, 0x63, 0xcf, 0x0e, + 0xe2, 0x48, 0xbe, 0x07, 0x65, 0x1a, 0x58, 0x2d, 0xdb, 0xe9, 0x8a, 0x38, 0x7a, 0xed, 0x7a, 0x4e, + 0xb6, 0xab, 0x79, 0x1a, 0x6c, 0xc5, 0x34, 0x74, 0x13, 0x80, 0x06, 0x16, 0xa7, 0xc7, 0xae, 0x1d, + 0x3c, 0xab, 0xe7, 0xa5, 0x44, 0x91, 0x06, 0x47, 0x8a, 0x70, 0xb6, 0x70, 0xe7, 0xae, 0x50, 0xb8, + 0xe8, 0x2b, 0xb8, 0x19, 0x10, 0xce, 0x5d, 0xd2, 0x13, 0x69, 0x31, 0x65, 0xa9, 0x85, 0xcb, 0x2c, + 0xb5, 0x31, 0xc2, 0x38, 0xbb, 0xd2, 0xc6, 0x13, 0x28, 0xc6, 0xdb, 0x89, 0x36, 0xa1, 0x14, 0xe5, + 0x2c, 0xb3, 0x42, 0x9d, 0xff, 0x77, 0xa6, 0x15, 0xac, 0x14, 0x6a, 0x7a, 0x94, 0x8b, 0x3d, 0xc1, + 0x45, 0x16, 0x41, 0x34, 0x28, 0xa0, 0xc9, 0x7d, 0x44, 0x87, 0xb0, 0x14, 0x03, 0x27, 0x92, 0xe4, + 0x1c, 0x0b, 0xe3, 0xbb, 0x8e, 0x11, 0x9b, 0x00, 0xdd, 0x2a, 0xc2, 0x9c, 0xa6, 0x9a, 0xbf, 0x35, + 0x60, 0x69, 0xbc, 0x9a, 0xaf, 0xd6, 0x29, 0xb6, 0xa1, 0xc8, 0xb4, 0x6a, 0x34, 0x2e, 0xdf, 0xbf, + 0x20, 0x77, 0x95, 0x34, 0x1e, 0xe9, 0x99, 0xff, 0x4c, 0x8f, 0xb5, 0x96, 0xd8, 0x97, 0x37, 0x2d, + 0xcf, 0x43, 0x40, 0x1d, 0x66, 0x7b, 0x9c, 0xb4, 0xc5, 0x6e, 0x58, 0x5c, 0x40, 0x46, 0x5e, 0xdd, + 0x9d, 0xf4, 0xea, 0x91, 0x92, 0xc5, 0xcd, 0xa4, 0xed, 0x6a, 0x67, 0x8c, 0x2a, 0xca, 0xf4, 0x7a, + 0x0c, 0x1a, 0x21, 0x68, 0xe4, 0x8c, 0x44, 0x7e, 0x30, 0x1b, 0x79, 0x14, 0xfb, 0xa4, 0x89, 0x6b, + 0x91, 0x89, 0x24, 0x6f, 0x62, 0x9a, 0x67, 0xaf, 0x32, 0xb7, 0xfe, 0x6a, 0xc0, 0xd2, 0xb4, 0x65, + 0xa1, 0x8f, 0x21, 0xcb, 0x87, 0x7d, 0x15, 0xbb, 0xca, 0x05, 0x19, 0x7a, 0x34, 0xec, 0x13, 0x2c, + 0xc5, 0xd1, 0x0e, 0x54, 0xa2, 0xc5, 0xc7, 0xd1, 0x9c, 0x51, 0x3f, 0xc9, 0x15, 0x96, 0xb5, 0x92, + 0x5e, 0xd9, 0x5d, 0xa8, 0x72, 0x46, 0x9d, 0xae, 0x4b, 0x2c, 0x4e, 0x7b, 0xc4, 0xd2, 0x6d, 0x2e, + 0x83, 0xcb, 0x9a, 0x7c, 0x44, 0x7b, 0x64, 0x3f, 0x30, 0xff, 0x61, 0xc0, 0xcd, 0x73, 0x43, 0x77, + 0x89, 0x65, 0x24, 0xf4, 0xfe, 0x5f, 0xcb, 0xf8, 0x5d, 0x16, 0x4a, 0x89, 0x6e, 0x82, 0x10, 0xe4, + 0x98, 0x6e, 0x0f, 0xc6, 0x8a, 0x81, 0x33, 0x0c, 0x37, 0x05, 0x6d, 0x20, 0x69, 0x69, 0x45, 0x1b, + 0xe0, 0xa6, 0x68, 0x8f, 0x8c, 0xd8, 0x6d, 0xab, 0x35, 0xe4, 0x44, 0x41, 0x1b, 0xa2, 0x4a, 0xec, + 0xf6, 0x96, 0x20, 0xa0, 0x5b, 0x50, 0x1a, 0x30, 0xca, 0x89, 0xe6, 0x67, 0x25, 0x1f, 0x24, 0x49, + 0x09, 0xdc, 0x83, 0x05, 0xee, 0x73, 0xdb, 0xb5, 0x9c, 0x7e, 0x18, 0x7b, 0x98, 0x93, 0x62, 0x15, + 0xc9, 0xd8, 0xee, 0x87, 0xca, 0x45, 0xf4, 0x21, 0x5c, 0x0b, 0x4e, 0x5c, 0xcb, 0xb5, 0x87, 0x84, + 0x8d, 0x89, 0xe7, 0xa5, 0xf8, 0x42, 0x70, 0xe2, 0xee, 0x09, 0xde, 0x48, 0xe3, 0x1e, 0x2c, 0x74, + 0x4f, 0x2d, 0xe9, 0x1f, 0xeb, 0x3b, 0x96, 0xe3, 0x87, 0x1e, 0x97, 0x2d, 0xda, 0xc0, 0x95, 0xee, + 0x29, 0x26, 0x76, 0x1b, 0xf7, 0x9d, 0x6d, 0x41, 0x45, 0xf7, 0x01, 0x75, 0x4f, 0x2d, 0xe5, 0xeb, + 0x48, 0xb6, 0x20, 0x65, 0xab, 0xdd, 0xd3, 0x2f, 0x05, 0x23, 0x16, 0xfe, 0x09, 0xdc, 0x90, 0xa0, + 0x0e, 0xf3, 0x83, 0xc0, 0xb2, 0x5f, 0x5a, 0x9c, 0xd9, 0xc7, 0xc7, 0xd4, 0xd1, 0xab, 0x2c, 0xca, + 0x71, 0x7e, 0x5d, 0x88, 0x6c, 0x0b, 0x89, 0xcd, 0x97, 0x47, 0x8a, 0xaf, 0x96, 0xfc, 0x53, 0xf8, + 0x8e, 0xb2, 0x33, 0x43, 0x1d, 0xa4, 0x7a, 0x5d, 0xca, 0x4c, 0xd3, 0xbf, 0x09, 0x25, 0x4e, 0xc5, + 0xba, 0xac, 0xd0, 0x3a, 0x5d, 0xaf, 0x97, 0xa4, 0x8f, 0x05, 0x41, 0xc2, 0xcd, 0x2f, 0xd6, 0x15, + 0xbb, 0xdd, 0x8a, 0xd8, 0xf3, 0x11, 0xbb, 0xdd, 0x92, 0xec, 0xf7, 0xa0, 0xa2, 0x87, 0x59, 0x24, + 0x51, 0x96, 0x12, 0x25, 0x4d, 0x15, 0x42, 0xe6, 0x53, 0xa8, 0x9e, 0xe9, 0xfe, 0x57, 0x2d, 0xc6, + 0xf8, 0x06, 0xa6, 0x72, 0x46, 0xdf, 0xc0, 0x04, 0xfe, 0x78, 0xef, 0xbf, 0x6a, 0x95, 0x4c, 0xc7, + 0xff, 0x7b, 0x16, 0xca, 0x63, 0x87, 0x4a, 0x71, 0x3a, 0x4c, 0xf4, 0x61, 0xf9, 0x1b, 0x3d, 0x80, + 0x6c, 0xcf, 0x6f, 0x2b, 0xd5, 0xca, 0xfa, 0x8d, 0x69, 0x2d, 0xd1, 0x0f, 0xfb, 0xfb, 0x7e, 0x9b, + 0x60, 0x29, 0x88, 0xf6, 0x60, 0x5e, 0xc4, 0x4c, 0x0c, 0x5a, 0xea, 0x75, 0xa2, 0x73, 0xcf, 0xea, + 0x0c, 0xc5, 0x44, 0x40, 0x0e, 0xb5, 0x06, 0x06, 0xd6, 0x8c, 0x7e, 0xa3, 0xa7, 0x70, 0x6d, 0xec, + 0x2c, 0x15, 0xc3, 0x66, 0xcf, 0x87, 0x1d, 0xc5, 0x21, 0x86, 0x5d, 0x64, 0x93, 0x44, 0xd4, 0x80, + 0x42, 0x9f, 0x51, 0x9f, 0x51, 0x3e, 0x94, 0x15, 0x55, 0xc6, 0xf1, 0x37, 0xda, 0x83, 0x1a, 0x0b, + 0x3d, 0x7b, 0x60, 0x0f, 0x47, 0x66, 0xf3, 0xb3, 0x9a, 0x37, 0x56, 0x92, 0xb1, 0xb5, 0x2a, 0x1b, + 0x27, 0xa0, 0x26, 0x2c, 0x8e, 0x4e, 0x51, 0x23, 0x40, 0x75, 0x18, 0x9a, 0x72, 0xb2, 0x1e, 0x1d, + 0xaf, 0x62, 0x4c, 0xd4, 0x9a, 0xa0, 0xa1, 0x0d, 0x98, 0xc3, 0x4d, 0x79, 0x6b, 0xbc, 0xdc, 0x09, + 0x28, 0x92, 0x3e, 0x3b, 0x95, 0x8a, 0x57, 0x99, 0x4a, 0x3f, 0x87, 0xfa, 0xac, 0x5d, 0x44, 0x6b, + 0x90, 0x89, 0x5a, 0xe3, 0x85, 0xfd, 0x38, 0xcd, 0x9a, 0xe6, 0xdf, 0x8c, 0x08, 0x6c, 0xca, 0x36, + 0x3d, 0x80, 0x8c, 0xd3, 0xbf, 0x24, 0x98, 0x90, 0x44, 0x9f, 0xc0, 0x1c, 0xf5, 0x65, 0x57, 0xbb, + 0xdc, 0x44, 0xc8, 0x53, 0x5f, 0xb4, 0x3a, 0xf4, 0x23, 0x28, 0x50, 0x5f, 0xb5, 0x38, 0x9d, 0xb9, + 0x17, 0x28, 0xce, 0x51, 0x5f, 0xf6, 0x3d, 0xb3, 0x03, 0xa5, 0xe4, 0x40, 0xfb, 0x14, 0x0a, 0xf1, + 0x1e, 0x1b, 0xb3, 0xf6, 0x58, 0x2a, 0xec, 0xd1, 0x5e, 0x22, 0xf9, 0x63, 0x2d, 0xf4, 0x0e, 0xe4, + 0x13, 0x33, 0xcd, 0xc0, 0xfa, 0xcb, 0x3c, 0xd1, 0x37, 0x9e, 0x31, 0x3d, 0x74, 0x03, 0x8a, 0xc7, + 0xd4, 0x75, 0x2d, 0x66, 0x73, 0x55, 0xc0, 0x59, 0x5c, 0x10, 0x04, 0x6c, 0x73, 0x22, 0x26, 0x4c, + 0x2b, 0x64, 0x01, 0xb7, 0x5c, 0xa1, 0x23, 0xf1, 0x32, 0x18, 0x24, 0x49, 0xa2, 0x88, 0x09, 0xd5, + 0xb3, 0x5f, 0x8c, 0x8e, 0x3f, 0x72, 0x42, 0xf5, 0xec, 0x17, 0x6a, 0x40, 0x9a, 0x77, 0x20, 0x27, + 0x0f, 0x87, 0xa8, 0x0e, 0x73, 0x3d, 0x12, 0x04, 0x76, 0x27, 0x6a, 0x12, 0xd1, 0xa7, 0xf9, 0x1b, + 0x03, 0x4a, 0xba, 0x06, 0x70, 0xe8, 0x8a, 0xbe, 0xb1, 0x44, 0x5e, 0x10, 0xc7, 0x22, 0xae, 0xdd, + 0x0f, 0xc4, 0x78, 0xd6, 0x73, 0x48, 0xb9, 0xb6, 0x20, 0x78, 0x0f, 0x15, 0x4b, 0xcf, 0xa1, 0xf7, + 0xa1, 0xd2, 0x67, 0xbe, 0x43, 0x02, 0x21, 0x2d, 0x72, 0x4c, 0xbb, 0x59, 0x8e, 0xa9, 0x22, 0x13, + 0xd1, 0x1d, 0x98, 0x8f, 0xce, 0xcf, 0xa1, 0x47, 0xb9, 0x1e, 0xd4, 0xd1, 0x61, 0x5d, 0x64, 0xa0, + 0x79, 0x0a, 0xf3, 0xda, 0x93, 0x2f, 0x6d, 0xee, 0x3c, 0x13, 0xa7, 0x4d, 0x71, 0x53, 0xa0, 0x5e, + 0xc7, 0x6a, 0x87, 0xcc, 0x96, 0x77, 0x25, 0xed, 0x49, 0x06, 0x2f, 0x68, 0xd6, 0x8e, 0xe6, 0xec, + 0x07, 0xe8, 0x13, 0xdd, 0x65, 0x55, 0xcb, 0x33, 0x67, 0xd6, 0xba, 0x44, 0x1f, 0xb5, 0x59, 0xf3, + 0xdf, 0x06, 0x54, 0xcf, 0xb4, 0x01, 0xf4, 0x11, 0x64, 0x59, 0xe8, 0x92, 0xd9, 0x99, 0x9b, 0x88, + 0x19, 0x96, 0xa2, 0x68, 0x03, 0xf2, 0xb6, 0x23, 0x5c, 0xd1, 0x0e, 0xdc, 0x9a, 0xa9, 0xb4, 0x29, + 0xc5, 0xb0, 0x16, 0x47, 0x3f, 0x84, 0xdc, 0x40, 0xb8, 0xa4, 0x13, 0x77, 0xf9, 0x7c, 0xc7, 0xb1, + 0x12, 0x46, 0xab, 0xb0, 0x10, 0x0c, 0x28, 0x77, 0x9e, 0x25, 0x4f, 0xe2, 0x59, 0xb9, 0xb9, 0x55, + 0xc5, 0x88, 0xcf, 0xe1, 0xe6, 0x53, 0x40, 0x93, 0x6d, 0x49, 0xa4, 0xde, 0x73, 0xbf, 0x65, 0x89, + 0x18, 0xa8, 0x97, 0x82, 0x22, 0x2e, 0x3c, 0xf7, 0x5b, 0x22, 0x32, 0x01, 0xba, 0x0f, 0x0b, 0x21, + 0xa7, 0x2e, 0x7d, 0xa9, 0xe2, 0x3e, 0x4a, 0xc0, 0x2c, 0xae, 0x25, 0x18, 0x32, 0x0d, 0x4d, 0x0c, + 0xa5, 0x03, 0x9b, 0x71, 0xea, 0xd0, 0xbe, 0xed, 0xf1, 0xa9, 0xf3, 0xa8, 0x02, 0x69, 0xfd, 0xf6, + 0x93, 0xc5, 0x69, 0xda, 0x16, 0xa9, 0xed, 0xd2, 0x80, 0x13, 0xcf, 0x0a, 0x99, 0xab, 0x4e, 0xee, + 0x45, 0x0c, 0x8a, 0xd4, 0x64, 0x6e, 0xb0, 0xfa, 0xee, 0xd8, 0x98, 0x16, 0x4e, 0xa1, 0x3c, 0xa4, + 0x71, 0xb3, 0x96, 0x5a, 0xfd, 0xf1, 0xd8, 0x84, 0x95, 0xac, 0x39, 0xc8, 0x6c, 0x1f, 0x34, 0x6b, + 0x29, 0x54, 0x01, 0xd8, 0xfd, 0x5c, 0xb4, 0x84, 0x9f, 0xb9, 0xfe, 0xa0, 0x66, 0xa0, 0x2a, 0x94, + 0x76, 0x3f, 0x97, 0x95, 0x2e, 0x09, 0xe9, 0xd5, 0x8f, 0xa0, 0x18, 0x8f, 0x3e, 0x54, 0x82, 0xb9, + 0xa6, 0xd7, 0xf5, 0xfc, 0x81, 0x57, 0x4b, 0x21, 0x80, 0x3c, 0x6e, 0x0a, 0x72, 0xcd, 0x10, 0x0c, + 0x6c, 0x0f, 0xe4, 0x47, 0x7a, 0xf5, 0x08, 0xca, 0x63, 0x3b, 0x27, 0x8c, 0x3c, 0xf1, 0x3d, 0xa2, + 0xbe, 0x94, 0xe6, 0x0e, 0x1b, 0xe2, 0xd0, 0xab, 0x19, 0x68, 0x1e, 0x0a, 0xdb, 0xbe, 0xef, 0xee, + 0x08, 0xcc, 0x34, 0x2a, 0x40, 0xf6, 0x31, 0x75, 0xdd, 0x5a, 0x46, 0x38, 0x72, 0x38, 0xda, 0x96, + 0x5a, 0x76, 0x75, 0x1b, 0x6a, 0x67, 0x13, 0x12, 0x95, 0xa1, 0x28, 0x80, 0x25, 0xa1, 0x96, 0x42, + 0x45, 0xc8, 0x3d, 0x7c, 0x61, 0x3b, 0x5c, 0x39, 0x74, 0x48, 0x7b, 0xd4, 0xb5, 0x99, 0x42, 0x3d, + 0x70, 0x6d, 0xaf, 0x96, 0x59, 0xff, 0x53, 0x4e, 0x84, 0x49, 0x05, 0x62, 0x5f, 0x65, 0x0b, 0x3a, + 0x01, 0x34, 0xf9, 0xf6, 0x8a, 0xee, 0x4f, 0xa6, 0xd5, 0xcc, 0x77, 0xe2, 0xc6, 0xf7, 0x2f, 0x27, + 0xac, 0xae, 0x85, 0x66, 0x0a, 0x75, 0xa1, 0x76, 0xf6, 0xcd, 0x12, 0xdd, 0x9b, 0x32, 0xe3, 0xa7, + 0xbf, 0xc5, 0x36, 0x56, 0x2f, 0x23, 0x9a, 0x34, 0xb6, 0xd9, 0x6e, 0x5f, 0x68, 0x6c, 0xc6, 0x6b, + 0xde, 0x34, 0x63, 0xb3, 0x9e, 0xe9, 0xcc, 0x14, 0xf2, 0x60, 0x71, 0xdf, 0x6f, 0xd3, 0xe3, 0xe1, + 0xff, 0xc8, 0x1e, 0x87, 0xc5, 0x29, 0x0f, 0x9d, 0x68, 0xca, 0x86, 0xcc, 0x7e, 0xa1, 0x6d, 0x7c, + 0x70, 0x49, 0xe9, 0xd8, 0xea, 0x73, 0x58, 0xdc, 0x74, 0x4e, 0x42, 0xca, 0x92, 0x97, 0xbb, 0x00, + 0x9d, 0xff, 0x72, 0x10, 0x67, 0xcb, 0xdd, 0x8b, 0xc4, 0x22, 0x3b, 0x2b, 0xc6, 0x87, 0xc6, 0xd6, + 0xed, 0x6f, 0xff, 0x58, 0x30, 0xfe, 0xf5, 0x6a, 0xd9, 0xf8, 0xe6, 0xd5, 0xb2, 0xf1, 0x9f, 0x57, + 0xcb, 0xc6, 0xd7, 0xaf, 0x97, 0x53, 0x7f, 0x78, 0xbd, 0x9c, 0xfa, 0xe6, 0xf5, 0x72, 0xea, 0xdb, + 0xd7, 0xcb, 0xa9, 0x56, 0x5e, 0xfe, 0xe7, 0xf1, 0x83, 0xff, 0x06, 0x00, 0x00, 0xff, 0xff, 0x83, + 0x7b, 0x60, 0x79, 0x46, 0x19, 0x00, 0x00, } // Reference imports to suppress errors if they are not otherwise used. @@ -3021,6 +3033,18 @@ func (m *TokenBucketRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.SettlementSinceLastRequest != nil { + { + size, err := m.SettlementSinceLastRequest.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintResourceManager(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x42 + } if m.KeyspaceId != nil { { size, err := m.KeyspaceId.MarshalToSizedBuffer(dAtA[:i]) @@ -4310,6 +4334,10 @@ func (m *TokenBucketRequest) Size() (n int) { l = m.KeyspaceId.Size() n += 1 + l + sovResourceManager(uint64(l)) } + if m.SettlementSinceLastRequest != nil { + l = m.SettlementSinceLastRequest.Size() + n += 1 + l + sovResourceManager(uint64(l)) + } return n } @@ -6118,6 +6146,42 @@ func (m *TokenBucketRequest) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 8: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field SettlementSinceLastRequest", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowResourceManager + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthResourceManager + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthResourceManager + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.SettlementSinceLastRequest == nil { + m.SettlementSinceLastRequest = &Consumption{} + } + if err := m.SettlementSinceLastRequest.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex default: iNdEx = preIndex skippy, err := skipResourceManager(dAtA[iNdEx:]) diff --git a/proto/resource_manager.proto b/proto/resource_manager.proto index 302efc9deb..a66fcabee4 100644 --- a/proto/resource_manager.proto +++ b/proto/resource_manager.proto @@ -108,7 +108,8 @@ message TokenBucketRequest { // Raw mode, group settings with CPU/IO etc resource unit. RequestRawResource raw_resource_items = 3; } - // Aggregate statistics in group level. + // Actual resource usage in group level since the last token bucket request. + // This field is used for resource group stats and metering. Consumption consumption_since_last_request = 4; // label background request. bool is_background = 5; @@ -119,6 +120,9 @@ message TokenBucketRequest { // - If the keyspace ID is set to a valid value, it will try to request the token bucket from // the resource group within the given keyspace ID. KeyspaceIDValue keyspace_id = 7; + // Signed token settlement in group level since the last token bucket request. + // RRU/WRU may be negative to report refunds. This field must not be used for metering. + Consumption settlement_since_last_request = 8; } message TokenBucketsResponse { diff --git a/scripts/proto.lock b/scripts/proto.lock index 6a9b573733..de7be4b956 100644 --- a/scripts/proto.lock +++ b/scripts/proto.lock @@ -24570,6 +24570,11 @@ "id": 7, "name": "keyspace_id", "type": "KeyspaceIDValue" + }, + { + "id": 8, + "name": "settlement_since_last_request", + "type": "Consumption" } ], "messages": [