From 8ba1e2628d7a41318a716a7c46e5d8a98aeab835 Mon Sep 17 00:00:00 2001 From: Benjamin Wang Date: Tue, 7 Mar 2023 11:08:54 +0800 Subject: [PATCH] lease: add a lease_new request into raft_internal.proto Executed: 1. ./scripts/genproto.sh 2. ./scripts/update_proto_annotations.sh Signed-off-by: Benjamin Wang --- api/etcdserverpb/raft_internal.pb.go | 189 +++++++++++++++++---------- api/etcdserverpb/raft_internal.proto | 1 + scripts/etcd_version_annotations.txt | 1 + 3 files changed, 124 insertions(+), 67 deletions(-) diff --git a/api/etcdserverpb/raft_internal.pb.go b/api/etcdserverpb/raft_internal.pb.go index d59e65813f4..c7ef10644ee 100644 --- a/api/etcdserverpb/raft_internal.pb.go +++ b/api/etcdserverpb/raft_internal.pb.go @@ -85,6 +85,7 @@ type InternalRaftRequest struct { LeaseRevoke *LeaseRevokeRequest `protobuf:"bytes,9,opt,name=lease_revoke,json=leaseRevoke,proto3" json:"lease_revoke,omitempty"` Alarm *AlarmRequest `protobuf:"bytes,10,opt,name=alarm,proto3" json:"alarm,omitempty"` LeaseCheckpoint *LeaseCheckpointRequest `protobuf:"bytes,11,opt,name=lease_checkpoint,json=leaseCheckpoint,proto3" json:"lease_checkpoint,omitempty"` + LeaseRenew *LeaseKeepAliveRequest `protobuf:"bytes,12,opt,name=lease_renew,json=leaseRenew,proto3" json:"lease_renew,omitempty"` AuthEnable *AuthEnableRequest `protobuf:"bytes,1000,opt,name=auth_enable,json=authEnable,proto3" json:"auth_enable,omitempty"` AuthDisable *AuthDisableRequest `protobuf:"bytes,1011,opt,name=auth_disable,json=authDisable,proto3" json:"auth_disable,omitempty"` AuthStatus *AuthStatusRequest `protobuf:"bytes,1013,opt,name=auth_status,json=authStatus,proto3" json:"auth_status,omitempty"` @@ -238,73 +239,75 @@ func init() { func init() { proto.RegisterFile("raft_internal.proto", fileDescriptor_b4c9a9be0cfca103) } var fileDescriptor_b4c9a9be0cfca103 = []byte{ - // 1054 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x56, 0x5d, 0x6f, 0x1b, 0x45, - 0x14, 0xad, 0xd3, 0x34, 0x89, 0xc7, 0x49, 0x9a, 0x4e, 0x52, 0x3a, 0x38, 0x92, 0x71, 0x03, 0x2d, - 0x01, 0x8a, 0x53, 0x1c, 0x78, 0xe1, 0x05, 0x5c, 0x3b, 0x4a, 0x83, 0x4a, 0x15, 0x6d, 0x0b, 0xaa, - 0x84, 0xd0, 0x32, 0xde, 0xbd, 0xb1, 0xb7, 0x59, 0xef, 0x2e, 0x33, 0x63, 0x37, 0x7d, 0xe5, 0x91, - 0x67, 0x40, 0xfc, 0x0c, 0x3e, 0xff, 0x43, 0x85, 0xf8, 0x28, 0xf0, 0x07, 0x20, 0xbc, 0xf0, 0x0e, - 0xbc, 0xa3, 0xf9, 0xd8, 0x5d, 0xaf, 0x3d, 0xce, 0xdb, 0xfa, 0xde, 0x73, 0xcf, 0x39, 0x33, 0x73, - 0xef, 0x78, 0xd0, 0x3a, 0xa3, 0x47, 0xc2, 0x0d, 0x22, 0x01, 0x2c, 0xa2, 0x61, 0x23, 0x61, 0xb1, - 0x88, 0xf1, 0x32, 0x08, 0xcf, 0xe7, 0xc0, 0x46, 0xc0, 0x92, 0x6e, 0x75, 0xa3, 0x17, 0xf7, 0x62, - 0x95, 0xd8, 0x91, 0x5f, 0x1a, 0x53, 0x5d, 0xcb, 0x31, 0x26, 0x52, 0x66, 0x89, 0x67, 0x3e, 0xeb, - 0x32, 0xb9, 0x43, 0x93, 0x60, 0x67, 0x04, 0x8c, 0x07, 0x71, 0x94, 0x74, 0xd3, 0x2f, 0x83, 0xb8, - 0x9e, 0x21, 0x06, 0x30, 0xe8, 0x02, 0xe3, 0xfd, 0x20, 0x49, 0xba, 0x63, 0x3f, 0x34, 0x6e, 0x8b, - 0xa1, 0x15, 0x07, 0x3e, 0x1e, 0x02, 0x17, 0xb7, 0x81, 0xfa, 0xc0, 0xf0, 0x2a, 0x9a, 0x3b, 0xe8, - 0x90, 0x52, 0xbd, 0xb4, 0x3d, 0xef, 0xcc, 0x1d, 0x74, 0x70, 0x15, 0x2d, 0x0d, 0xb9, 0x34, 0x3f, - 0x00, 0x32, 0x57, 0x2f, 0x6d, 0x97, 0x9d, 0xec, 0x37, 0xbe, 0x81, 0x56, 0xe8, 0x50, 0xf4, 0x5d, - 0x06, 0xa3, 0x40, 0x6a, 0x93, 0xf3, 0xb2, 0xec, 0xd6, 0xe2, 0xa7, 0xdf, 0x93, 0xf3, 0xbb, 0x8d, - 0xd7, 0x9c, 0x65, 0x99, 0x75, 0x4c, 0xf2, 0xcd, 0xc5, 0x4f, 0x54, 0xf8, 0xe6, 0xd6, 0x0f, 0x18, - 0xad, 0x1f, 0x98, 0x1d, 0x71, 0xe8, 0x91, 0x30, 0x06, 0xf0, 0x2e, 0x5a, 0xe8, 0x2b, 0x13, 0xc4, - 0xaf, 0x97, 0xb6, 0x2b, 0xcd, 0xcd, 0xc6, 0xf8, 0x3e, 0x35, 0x0a, 0x3e, 0x1d, 0x03, 0x9d, 0xf2, - 0x7b, 0x0d, 0xcd, 0x8d, 0x9a, 0xca, 0x69, 0xa5, 0x79, 0xd9, 0x4a, 0xe0, 0xcc, 0x8d, 0x9a, 0xf8, - 0x26, 0xba, 0xc0, 0x68, 0xd4, 0x03, 0x65, 0xb9, 0xd2, 0xac, 0x4e, 0x20, 0x65, 0x2a, 0x85, 0x6b, - 0x20, 0x7e, 0x19, 0x9d, 0x4f, 0x86, 0x82, 0xcc, 0x2b, 0x3c, 0x29, 0xe2, 0x0f, 0x87, 0xe9, 0x22, - 0x1c, 0x09, 0xc2, 0x6d, 0xb4, 0xec, 0x43, 0x08, 0x02, 0x5c, 0x2d, 0x72, 0x41, 0x15, 0xd5, 0x8b, - 0x45, 0x1d, 0x85, 0x28, 0x48, 0x55, 0xfc, 0x3c, 0x26, 0x05, 0xc5, 0x49, 0x44, 0x16, 0x6c, 0x82, - 0xf7, 0x4f, 0xa2, 0x4c, 0x50, 0x9c, 0x44, 0xf8, 0x2d, 0x84, 0xbc, 0x78, 0x90, 0x50, 0x4f, 0xc8, - 0x63, 0x58, 0x54, 0x25, 0xcf, 0x15, 0x4b, 0xda, 0x59, 0x3e, 0xad, 0x1c, 0x2b, 0xc1, 0x6f, 0xa3, - 0x4a, 0x08, 0x94, 0x83, 0xdb, 0x63, 0x34, 0x12, 0x64, 0xc9, 0xc6, 0x70, 0x47, 0x02, 0xf6, 0x65, - 0x3e, 0x63, 0x08, 0xb3, 0x90, 0x5c, 0xb3, 0x66, 0x60, 0x30, 0x8a, 0x8f, 0x81, 0x94, 0x6d, 0x6b, - 0x56, 0x14, 0x8e, 0x02, 0x64, 0x6b, 0x0e, 0xf3, 0x98, 0x3c, 0x16, 0x1a, 0x52, 0x36, 0x20, 0xc8, - 0x76, 0x2c, 0x2d, 0x99, 0xca, 0x8e, 0x45, 0x01, 0xf1, 0x03, 0xb4, 0xa6, 0x65, 0xbd, 0x3e, 0x78, - 0xc7, 0x49, 0x1c, 0x44, 0x82, 0x54, 0x54, 0xf1, 0x0b, 0x16, 0xe9, 0x76, 0x06, 0x32, 0x34, 0x69, - 0xb3, 0xbe, 0xee, 0x5c, 0x0c, 0x8b, 0x00, 0xdc, 0x42, 0x15, 0xd5, 0xdd, 0x10, 0xd1, 0x6e, 0x08, - 0xe4, 0x6f, 0xeb, 0xae, 0xb6, 0x86, 0xa2, 0xbf, 0xa7, 0x00, 0xd9, 0x9e, 0xd0, 0x2c, 0x84, 0x3b, - 0x48, 0x8d, 0x80, 0xeb, 0x07, 0x5c, 0x71, 0xfc, 0xb3, 0x68, 0xdb, 0x14, 0xc9, 0xd1, 0xd1, 0x88, - 0x6c, 0x53, 0x68, 0x1e, 0xc3, 0xef, 0x18, 0x23, 0x5c, 0x50, 0x31, 0xe4, 0xe4, 0xbf, 0x99, 0x46, - 0xee, 0x29, 0xc0, 0xc4, 0xca, 0xde, 0xd0, 0x8e, 0x74, 0x0e, 0xdf, 0xd5, 0x8e, 0x20, 0x12, 0x81, - 0x47, 0x05, 0x90, 0x7f, 0x35, 0xd9, 0x4b, 0x45, 0xb2, 0x74, 0x3a, 0x5b, 0x63, 0xd0, 0xd4, 0x5a, - 0xa1, 0x1e, 0xef, 0x99, 0x2b, 0x40, 0xde, 0x09, 0x2e, 0xf5, 0x7d, 0xf2, 0xe3, 0xd2, 0xac, 0x25, - 0xbe, 0xc7, 0x81, 0xb5, 0x7c, 0xbf, 0xb0, 0x44, 0x13, 0xc3, 0x77, 0xd1, 0x5a, 0x4e, 0xa3, 0x87, - 0x80, 0xfc, 0xa4, 0x99, 0x9e, 0xb7, 0x33, 0x99, 0xe9, 0x31, 0x64, 0xab, 0xb4, 0x10, 0x2e, 0xda, - 0xea, 0x81, 0x20, 0x3f, 0x9f, 0x69, 0x6b, 0x1f, 0xc4, 0x94, 0xad, 0x7d, 0x10, 0xb8, 0x87, 0x9e, - 0xcd, 0x69, 0xbc, 0xbe, 0x1c, 0x4b, 0x37, 0xa1, 0x9c, 0x3f, 0x8a, 0x99, 0x4f, 0x7e, 0xd1, 0x94, - 0xaf, 0xd8, 0x29, 0xdb, 0x0a, 0x7d, 0x68, 0xc0, 0x29, 0xfb, 0x33, 0xd4, 0x9a, 0xc6, 0x0f, 0xd0, - 0xc6, 0x98, 0x5f, 0x39, 0x4f, 0x2e, 0x8b, 0x43, 0x20, 0x4f, 0xb5, 0xc6, 0xf5, 0x19, 0xb6, 0xd5, - 0x2c, 0xc6, 0x79, 0xdb, 0x5c, 0xa2, 0x93, 0x19, 0xfc, 0x01, 0xba, 0x9c, 0x33, 0xeb, 0xd1, 0xd4, - 0xd4, 0xbf, 0x6a, 0xea, 0x17, 0xed, 0xd4, 0x66, 0x46, 0xc7, 0xb8, 0x31, 0x9d, 0x4a, 0xe1, 0xdb, - 0x68, 0x35, 0x27, 0x0f, 0x03, 0x2e, 0xc8, 0x6f, 0x9a, 0xf5, 0xaa, 0x9d, 0xf5, 0x4e, 0xc0, 0x45, - 0xa1, 0x8f, 0xd2, 0x60, 0xc6, 0x24, 0xad, 0x69, 0xa6, 0xdf, 0x67, 0x32, 0x49, 0xe9, 0x29, 0xa6, - 0x34, 0x98, 0x1d, 0xbd, 0x62, 0x92, 0x1d, 0xf9, 0x55, 0x79, 0xd6, 0xd1, 0xcb, 0x9a, 0xc9, 0x8e, - 0x34, 0xb1, 0xac, 0x23, 0x15, 0x8d, 0xe9, 0xc8, 0xaf, 0xcb, 0xb3, 0x3a, 0x52, 0x56, 0x59, 0x3a, - 0x32, 0x0f, 0x17, 0x6d, 0xc9, 0x8e, 0xfc, 0xe6, 0x4c, 0x5b, 0x93, 0x1d, 0x69, 0x62, 0xf8, 0x21, - 0xaa, 0x8e, 0xd1, 0xa8, 0x46, 0x49, 0x80, 0x0d, 0x02, 0xae, 0xfe, 0x7f, 0xbf, 0xd5, 0x9c, 0x37, - 0x66, 0x70, 0x4a, 0xf8, 0x61, 0x86, 0x4e, 0xf9, 0xaf, 0x50, 0x7b, 0x1e, 0x0f, 0xd0, 0x66, 0xae, - 0x65, 0x5a, 0x67, 0x4c, 0xec, 0x3b, 0x2d, 0xf6, 0xaa, 0x5d, 0x4c, 0x77, 0xc9, 0xb4, 0x1a, 0xa1, - 0x33, 0x00, 0xf8, 0x23, 0xb4, 0xee, 0x85, 0x43, 0x2e, 0x80, 0xb9, 0xe6, 0x2d, 0xe3, 0x72, 0x10, - 0xe4, 0x33, 0x64, 0x46, 0x60, 0xfc, 0x21, 0xd3, 0x68, 0x6b, 0xe4, 0xfb, 0x1a, 0x78, 0x0f, 0xc4, - 0xd4, 0xad, 0x77, 0xc9, 0x9b, 0x84, 0xe0, 0x87, 0xe8, 0x4a, 0xaa, 0xa0, 0xc9, 0x5c, 0x2a, 0x04, - 0x53, 0x2a, 0x9f, 0x23, 0x73, 0x0f, 0xda, 0x54, 0xde, 0x55, 0xb1, 0x96, 0x10, 0xcc, 0x26, 0xb4, - 0xe1, 0x59, 0x50, 0xf8, 0x43, 0x84, 0xfd, 0xf8, 0x51, 0xd4, 0x63, 0xd4, 0x07, 0x37, 0x88, 0x8e, - 0x62, 0x25, 0xf3, 0x85, 0x96, 0xb9, 0x56, 0x94, 0xe9, 0xa4, 0xc0, 0x83, 0xe8, 0x28, 0xb6, 0x49, - 0xac, 0xf9, 0x13, 0x88, 0xfc, 0x31, 0x75, 0x11, 0xad, 0xec, 0x0d, 0x12, 0xf1, 0xd8, 0x01, 0x9e, - 0xc4, 0x11, 0x87, 0xad, 0xc7, 0x68, 0xf3, 0x8c, 0xeb, 0x1b, 0x63, 0x34, 0xaf, 0xde, 0x72, 0x25, - 0xf5, 0x96, 0x53, 0xdf, 0xf2, 0x8d, 0x97, 0xdd, 0x6a, 0xe6, 0x8d, 0x97, 0xfe, 0xc6, 0x57, 0xd1, - 0x32, 0x0f, 0x06, 0x49, 0x08, 0xae, 0x88, 0x8f, 0x41, 0x3f, 0xf1, 0xca, 0x4e, 0x45, 0xc7, 0xee, - 0xcb, 0x50, 0xe6, 0xe5, 0xd6, 0xc6, 0x93, 0x3f, 0x6b, 0xe7, 0x9e, 0x9c, 0xd6, 0x4a, 0x4f, 0x4f, - 0x6b, 0xa5, 0x3f, 0x4e, 0x6b, 0xa5, 0x2f, 0xff, 0xaa, 0x9d, 0xeb, 0x2e, 0xa8, 0x97, 0xe6, 0xee, - 0xff, 0x01, 0x00, 0x00, 0xff, 0xff, 0x30, 0x36, 0x53, 0xc6, 0x0b, 0x0b, 0x00, 0x00, + // 1083 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0x7c, 0x56, 0x4d, 0x73, 0x1b, 0x45, + 0x10, 0x8d, 0x6c, 0xc7, 0xb6, 0x46, 0xb6, 0xe3, 0x8c, 0x1d, 0x32, 0xd8, 0x55, 0x46, 0x31, 0x24, + 0x18, 0x08, 0x72, 0x90, 0x81, 0x03, 0x17, 0x50, 0x24, 0x97, 0x63, 0x48, 0x52, 0xae, 0x4d, 0xa0, + 0x52, 0x45, 0x51, 0xcb, 0x68, 0xb7, 0x2d, 0x6d, 0xbc, 0xda, 0x5d, 0x66, 0x46, 0xb2, 0x73, 0xe5, + 0xc8, 0x19, 0x28, 0xf8, 0x17, 0x7c, 0xfe, 0x87, 0x1c, 0xf8, 0x08, 0xf0, 0x07, 0xc0, 0x5c, 0xb8, + 0x03, 0xf7, 0xd4, 0x7c, 0xec, 0xae, 0x56, 0x1a, 0xf9, 0xb6, 0xea, 0x7e, 0xfd, 0xde, 0x9b, 0x99, + 0xee, 0xd1, 0xa0, 0x15, 0x46, 0x0f, 0x85, 0x1b, 0x44, 0x02, 0x58, 0x44, 0xc3, 0x5a, 0xc2, 0x62, + 0x11, 0xe3, 0x05, 0x10, 0x9e, 0xcf, 0x81, 0x0d, 0x80, 0x25, 0xed, 0xb5, 0xd5, 0x4e, 0xdc, 0x89, + 0x55, 0x62, 0x5b, 0x7e, 0x69, 0xcc, 0xda, 0x72, 0x8e, 0x31, 0x91, 0x32, 0x4b, 0x3c, 0xf3, 0x59, + 0x95, 0xc9, 0x6d, 0x9a, 0x04, 0xdb, 0x03, 0x60, 0x3c, 0x88, 0xa3, 0xa4, 0x9d, 0x7e, 0x19, 0xc4, + 0xb5, 0x0c, 0xd1, 0x83, 0x5e, 0x1b, 0x18, 0xef, 0x06, 0x49, 0xd2, 0x1e, 0xfa, 0xa1, 0x71, 0x9b, + 0x0c, 0x2d, 0x3a, 0xf0, 0x49, 0x1f, 0xb8, 0xb8, 0x05, 0xd4, 0x07, 0x86, 0x97, 0xd0, 0xd4, 0x7e, + 0x8b, 0x94, 0xaa, 0xa5, 0xad, 0x19, 0x67, 0x6a, 0xbf, 0x85, 0xd7, 0xd0, 0x7c, 0x9f, 0x4b, 0xf3, + 0x3d, 0x20, 0x53, 0xd5, 0xd2, 0x56, 0xd9, 0xc9, 0x7e, 0xe3, 0xeb, 0x68, 0x91, 0xf6, 0x45, 0xd7, + 0x65, 0x30, 0x08, 0xa4, 0x36, 0x99, 0x96, 0x65, 0x37, 0xe7, 0x3e, 0xfb, 0x91, 0x4c, 0xef, 0xd4, + 0x5e, 0x73, 0x16, 0x64, 0xd6, 0x31, 0xc9, 0xb7, 0xe6, 0x3e, 0x55, 0xe1, 0x1b, 0x9b, 0x5f, 0xaf, + 0xa0, 0x95, 0x7d, 0xb3, 0x23, 0x0e, 0x3d, 0x14, 0xc6, 0x00, 0xde, 0x41, 0xb3, 0x5d, 0x65, 0x82, + 0xf8, 0xd5, 0xd2, 0x56, 0xa5, 0xbe, 0x5e, 0x1b, 0xde, 0xa7, 0x5a, 0xc1, 0xa7, 0x63, 0xa0, 0x63, + 0x7e, 0xaf, 0xa2, 0xa9, 0x41, 0x5d, 0x39, 0xad, 0xd4, 0x2f, 0x59, 0x09, 0x9c, 0xa9, 0x41, 0x1d, + 0xdf, 0x40, 0xe7, 0x19, 0x8d, 0x3a, 0xa0, 0x2c, 0x57, 0xea, 0x6b, 0x23, 0x48, 0x99, 0x4a, 0xe1, + 0x1a, 0x88, 0x5f, 0x46, 0xd3, 0x49, 0x5f, 0x90, 0x19, 0x85, 0x27, 0x45, 0xfc, 0x41, 0x3f, 0x5d, + 0x84, 0x23, 0x41, 0xb8, 0x89, 0x16, 0x7c, 0x08, 0x41, 0x80, 0xab, 0x45, 0xce, 0xab, 0xa2, 0x6a, + 0xb1, 0xa8, 0xa5, 0x10, 0x05, 0xa9, 0x8a, 0x9f, 0xc7, 0xa4, 0xa0, 0x38, 0x89, 0xc8, 0xac, 0x4d, + 0xf0, 0xfe, 0x49, 0x94, 0x09, 0x8a, 0x93, 0x08, 0xbf, 0x8d, 0x90, 0x17, 0xf7, 0x12, 0xea, 0x09, + 0x79, 0x0c, 0x73, 0xaa, 0xe4, 0xb9, 0x62, 0x49, 0x33, 0xcb, 0xa7, 0x95, 0x43, 0x25, 0xf8, 0x1d, + 0x54, 0x09, 0x81, 0x72, 0x70, 0x3b, 0x8c, 0x46, 0x82, 0xcc, 0xdb, 0x18, 0x6e, 0x4b, 0xc0, 0x9e, + 0xcc, 0x67, 0x0c, 0x61, 0x16, 0x92, 0x6b, 0xd6, 0x0c, 0x0c, 0x06, 0xf1, 0x11, 0x90, 0xb2, 0x6d, + 0xcd, 0x8a, 0xc2, 0x51, 0x80, 0x6c, 0xcd, 0x61, 0x1e, 0x93, 0xc7, 0x42, 0x43, 0xca, 0x7a, 0x04, + 0xd9, 0x8e, 0xa5, 0x21, 0x53, 0xd9, 0xb1, 0x28, 0x20, 0x7e, 0x80, 0x96, 0xb5, 0xac, 0xd7, 0x05, + 0xef, 0x28, 0x89, 0x83, 0x48, 0x90, 0x8a, 0x2a, 0x7e, 0xc1, 0x22, 0xdd, 0xcc, 0x40, 0x86, 0x26, + 0x6d, 0xd6, 0xd7, 0x9d, 0x0b, 0x61, 0x11, 0x80, 0xef, 0xa4, 0x5b, 0xc2, 0x20, 0x82, 0x63, 0xb2, + 0xa0, 0x48, 0x9f, 0xb7, 0x90, 0xbe, 0x07, 0x90, 0x34, 0xc2, 0x60, 0x00, 0x23, 0x9c, 0x6f, 0x9a, + 0xfd, 0x71, 0x64, 0x3d, 0x6e, 0xa0, 0x8a, 0x1a, 0x16, 0x88, 0x68, 0x3b, 0x04, 0xf2, 0x8f, 0xf5, + 0x90, 0x1a, 0x7d, 0xd1, 0xdd, 0x55, 0x80, 0x6c, 0x8b, 0x69, 0x16, 0xc2, 0x2d, 0xa4, 0x26, 0xca, + 0xf5, 0x03, 0xae, 0x38, 0xfe, 0x9d, 0xb3, 0xed, 0xb1, 0xe4, 0x68, 0x69, 0x44, 0xb6, 0xc7, 0x34, + 0x8f, 0xe1, 0x77, 0x8d, 0x11, 0x2e, 0xa8, 0xe8, 0x73, 0xf2, 0xff, 0x44, 0x23, 0xf7, 0x14, 0x60, + 0x64, 0x51, 0x6f, 0x68, 0x47, 0x3a, 0x87, 0xef, 0x6a, 0x47, 0x10, 0x89, 0xc0, 0xa3, 0x02, 0xc8, + 0x7f, 0x9a, 0xec, 0xa5, 0x22, 0x59, 0x3a, 0xec, 0x8d, 0x21, 0x68, 0x6a, 0xad, 0x50, 0x8f, 0x77, + 0xcd, 0x8d, 0x22, 0xaf, 0x18, 0x97, 0xfa, 0x3e, 0xf9, 0x69, 0x7e, 0xd2, 0x12, 0xdf, 0xe7, 0xc0, + 0x1a, 0xbe, 0x5f, 0x58, 0xa2, 0x89, 0xe1, 0xbb, 0x68, 0x39, 0xa7, 0xd1, 0x33, 0x45, 0x7e, 0x9e, + 0xb7, 0x1d, 0x60, 0xca, 0x64, 0x86, 0xd1, 0x90, 0x2d, 0xd1, 0x42, 0xb8, 0x68, 0xab, 0x03, 0x82, + 0xfc, 0x72, 0xa6, 0xad, 0x3d, 0x10, 0x63, 0xb6, 0xf6, 0x40, 0xe0, 0x0e, 0x7a, 0x36, 0xa7, 0xf1, + 0xba, 0x72, 0xca, 0xdd, 0x84, 0x72, 0x7e, 0x1c, 0x33, 0x9f, 0xfc, 0xaa, 0x29, 0x5f, 0xb1, 0x53, + 0x36, 0x15, 0xfa, 0xc0, 0x80, 0x53, 0xf6, 0x67, 0xa8, 0x35, 0x8d, 0x1f, 0xa0, 0xd5, 0x21, 0xbf, + 0x72, 0x3c, 0x5d, 0x16, 0x87, 0x40, 0x9e, 0x68, 0x8d, 0x6b, 0x13, 0x6c, 0xab, 0xd1, 0x8e, 0xf3, + 0xb6, 0xb9, 0x48, 0x47, 0x33, 0xf8, 0x43, 0x74, 0x29, 0x67, 0xd6, 0x93, 0xae, 0xa9, 0x7f, 0xd3, + 0xd4, 0x2f, 0xda, 0xa9, 0xcd, 0xc8, 0x0f, 0x71, 0x63, 0x3a, 0x96, 0xc2, 0xb7, 0xd0, 0x52, 0x4e, + 0x1e, 0x06, 0x5c, 0x90, 0xdf, 0x35, 0xeb, 0x15, 0x3b, 0xeb, 0xed, 0x80, 0x8b, 0x42, 0x1f, 0xa5, + 0xc1, 0x8c, 0x49, 0x5a, 0xd3, 0x4c, 0x7f, 0x4c, 0x64, 0x92, 0xd2, 0x63, 0x4c, 0x69, 0x30, 0x3b, + 0x7a, 0xc5, 0x24, 0x3b, 0xf2, 0x9b, 0xf2, 0xa4, 0xa3, 0x97, 0x35, 0xa3, 0x1d, 0x69, 0x62, 0x59, + 0x47, 0x2a, 0x1a, 0xd3, 0x91, 0xdf, 0x96, 0x27, 0x75, 0xa4, 0xac, 0xb2, 0x74, 0x64, 0x1e, 0x2e, + 0xda, 0x92, 0x1d, 0xf9, 0xdd, 0x99, 0xb6, 0x46, 0x3b, 0xd2, 0xc4, 0xf0, 0x43, 0xb4, 0x36, 0x44, + 0xa3, 0x1a, 0x25, 0x01, 0xd6, 0x0b, 0xb8, 0xfa, 0x3b, 0xff, 0x5e, 0x73, 0x5e, 0x9f, 0xc0, 0x29, + 0xe1, 0x07, 0x19, 0x3a, 0xe5, 0xbf, 0x4c, 0xed, 0x79, 0xdc, 0x43, 0xeb, 0xb9, 0x96, 0x69, 0x9d, + 0x21, 0xb1, 0x1f, 0xb4, 0xd8, 0xab, 0x76, 0x31, 0xdd, 0x25, 0xe3, 0x6a, 0x84, 0x4e, 0x00, 0xe0, + 0x8f, 0xd1, 0x8a, 0x17, 0xf6, 0xb9, 0x00, 0xe6, 0x9a, 0xa7, 0x91, 0xcb, 0x41, 0x90, 0xcf, 0x91, + 0x19, 0x81, 0xe1, 0x77, 0x51, 0xad, 0xa9, 0x91, 0x1f, 0x68, 0xe0, 0x3d, 0x10, 0x63, 0xb7, 0xde, + 0x45, 0x6f, 0x14, 0x82, 0x1f, 0xa2, 0xcb, 0xa9, 0x82, 0x26, 0x73, 0xa9, 0x10, 0x4c, 0xa9, 0x7c, + 0x81, 0xcc, 0x3d, 0x68, 0x53, 0xb9, 0xa3, 0x62, 0x0d, 0x21, 0x98, 0x4d, 0x68, 0xd5, 0xb3, 0xa0, + 0xf0, 0x47, 0x08, 0xfb, 0xf1, 0x71, 0xd4, 0x61, 0xd4, 0x07, 0x37, 0x88, 0x0e, 0x63, 0x25, 0xf3, + 0xa5, 0x96, 0xb9, 0x5a, 0x94, 0x69, 0xa5, 0xc0, 0xfd, 0xe8, 0x30, 0xb6, 0x49, 0x2c, 0xfb, 0x23, + 0x88, 0xfc, 0x6d, 0x76, 0x01, 0x2d, 0xee, 0xf6, 0x12, 0xf1, 0xc8, 0x01, 0x9e, 0xc4, 0x11, 0x87, + 0xcd, 0x47, 0x68, 0xfd, 0x8c, 0xeb, 0x1b, 0x63, 0x34, 0xa3, 0x9e, 0x86, 0x25, 0xf5, 0x34, 0x54, + 0xdf, 0xf2, 0xc9, 0x98, 0xdd, 0x6a, 0xe6, 0xc9, 0x98, 0xfe, 0xc6, 0x57, 0xd0, 0x02, 0x0f, 0x7a, + 0x49, 0x08, 0xae, 0x88, 0x8f, 0x40, 0xbf, 0x18, 0xcb, 0x4e, 0x45, 0xc7, 0xee, 0xcb, 0x50, 0xe6, + 0xe5, 0xe6, 0xea, 0xe3, 0xbf, 0x36, 0xce, 0x3d, 0x3e, 0xdd, 0x28, 0x3d, 0x39, 0xdd, 0x28, 0xfd, + 0x79, 0xba, 0x51, 0xfa, 0xea, 0xef, 0x8d, 0x73, 0xed, 0x59, 0xf5, 0x70, 0xdd, 0x79, 0x1a, 0x00, + 0x00, 0xff, 0xff, 0x51, 0x34, 0x24, 0xd0, 0x5a, 0x0b, 0x00, 0x00, } func (m *RequestHeader) Marshal() (dAtA []byte, err error) { @@ -669,6 +672,18 @@ func (m *InternalRaftRequest) MarshalToSizedBuffer(dAtA []byte) (int, error) { i-- dAtA[i] = 0xa2 } + if m.LeaseRenew != nil { + { + size, err := m.LeaseRenew.MarshalToSizedBuffer(dAtA[:i]) + if err != nil { + return 0, err + } + i -= size + i = encodeVarintRaftInternal(dAtA, i, uint64(size)) + } + i-- + dAtA[i] = 0x62 + } if m.LeaseCheckpoint != nil { { size, err := m.LeaseCheckpoint.MarshalToSizedBuffer(dAtA[:i]) @@ -954,6 +969,10 @@ func (m *InternalRaftRequest) Size() (n int) { l = m.LeaseCheckpoint.Size() n += 1 + l + sovRaftInternal(uint64(l)) } + if m.LeaseRenew != nil { + l = m.LeaseRenew.Size() + n += 1 + l + sovRaftInternal(uint64(l)) + } if m.Header != nil { l = m.Header.Size() n += 2 + l + sovRaftInternal(uint64(l)) @@ -1615,6 +1634,42 @@ func (m *InternalRaftRequest) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 12: + if wireType != 2 { + return fmt.Errorf("proto: wrong wireType = %d for field LeaseRenew", wireType) + } + var msglen int + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowRaftInternal + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + msglen |= int(b&0x7F) << shift + if b < 0x80 { + break + } + } + if msglen < 0 { + return ErrInvalidLengthRaftInternal + } + postIndex := iNdEx + msglen + if postIndex < 0 { + return ErrInvalidLengthRaftInternal + } + if postIndex > l { + return io.ErrUnexpectedEOF + } + if m.LeaseRenew == nil { + m.LeaseRenew = &LeaseKeepAliveRequest{} + } + if err := m.LeaseRenew.Unmarshal(dAtA[iNdEx:postIndex]); err != nil { + return err + } + iNdEx = postIndex case 100: if wireType != 2 { return fmt.Errorf("proto: wrong wireType = %d for field Header", wireType) diff --git a/api/etcdserverpb/raft_internal.proto b/api/etcdserverpb/raft_internal.proto index f1036b9f619..f457c90ab2a 100644 --- a/api/etcdserverpb/raft_internal.proto +++ b/api/etcdserverpb/raft_internal.proto @@ -44,6 +44,7 @@ message InternalRaftRequest { AlarmRequest alarm = 10; LeaseCheckpointRequest lease_checkpoint = 11 [(versionpb.etcd_version_field) = "3.4"]; + LeaseKeepAliveRequest lease_renew = 12 [(versionpb.etcd_version_field) = "3.6"]; AuthEnableRequest auth_enable = 1000; AuthDisableRequest auth_disable = 1011; diff --git a/scripts/etcd_version_annotations.txt b/scripts/etcd_version_annotations.txt index 3e5d23f94d8..4da014f8c0d 100644 --- a/scripts/etcd_version_annotations.txt +++ b/scripts/etcd_version_annotations.txt @@ -204,6 +204,7 @@ etcdserverpb.InternalRaftRequest.downgrade_info_set: "3.5" etcdserverpb.InternalRaftRequest.header: "" etcdserverpb.InternalRaftRequest.lease_checkpoint: "3.4" etcdserverpb.InternalRaftRequest.lease_grant: "" +etcdserverpb.InternalRaftRequest.lease_renew: "3.6" etcdserverpb.InternalRaftRequest.lease_revoke: "" etcdserverpb.InternalRaftRequest.put: "" etcdserverpb.InternalRaftRequest.range: ""