From 098f9f1a1b1310cb1030fc70af62b367415da494 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Kenfe-Micka=C3=ABl=20Laventure?= Date: Mon, 13 Jun 2016 10:59:12 -0700 Subject: [PATCH] Use uin64 for UpdateResource rpc (#265) Signed-off-by: Kenfe-Mickael Laventure --- api/grpc/types/api.pb.go | 320 +++++++++++++++++++-------------------- api/grpc/types/api.proto | 18 +-- ctr/container.go | 49 +++--- 3 files changed, 200 insertions(+), 187 deletions(-) diff --git a/api/grpc/types/api.pb.go b/api/grpc/types/api.pb.go index 9b242d5..e6fd0af 100644 --- a/api/grpc/types/api.pb.go +++ b/api/grpc/types/api.pb.go @@ -71,9 +71,7 @@ var _ = math.Inf // This is a compile-time assertion to ensure that this generated file // is compatible with the proto package it is being compiled against. -// A compilation error at this line likely means your copy of the -// proto package needs to be updated. -const _ = proto.ProtoPackageIsVersion1 // please upgrade the proto package +const _ = proto.ProtoPackageIsVersion1 type GetServerVersionRequest struct { } @@ -455,17 +453,17 @@ func (m *UpdateContainerRequest) GetResources() *UpdateResource { } type UpdateResource struct { - BlkioWeight uint32 `protobuf:"varint,1,opt,name=blkioWeight" json:"blkioWeight,omitempty"` - CpuShares uint32 `protobuf:"varint,2,opt,name=cpuShares" json:"cpuShares,omitempty"` - CpuPeriod uint32 `protobuf:"varint,3,opt,name=cpuPeriod" json:"cpuPeriod,omitempty"` - CpuQuota uint32 `protobuf:"varint,4,opt,name=cpuQuota" json:"cpuQuota,omitempty"` + BlkioWeight uint64 `protobuf:"varint,1,opt,name=blkioWeight" json:"blkioWeight,omitempty"` + CpuShares uint64 `protobuf:"varint,2,opt,name=cpuShares" json:"cpuShares,omitempty"` + CpuPeriod uint64 `protobuf:"varint,3,opt,name=cpuPeriod" json:"cpuPeriod,omitempty"` + CpuQuota uint64 `protobuf:"varint,4,opt,name=cpuQuota" json:"cpuQuota,omitempty"` CpusetCpus string `protobuf:"bytes,5,opt,name=cpusetCpus" json:"cpusetCpus,omitempty"` CpusetMems string `protobuf:"bytes,6,opt,name=cpusetMems" json:"cpusetMems,omitempty"` - MemoryLimit uint32 `protobuf:"varint,7,opt,name=memoryLimit" json:"memoryLimit,omitempty"` - MemorySwap uint32 `protobuf:"varint,8,opt,name=memorySwap" json:"memorySwap,omitempty"` - MemoryReservation uint32 `protobuf:"varint,9,opt,name=memoryReservation" json:"memoryReservation,omitempty"` - KernelMemoryLimit uint32 `protobuf:"varint,10,opt,name=kernelMemoryLimit" json:"kernelMemoryLimit,omitempty"` - KernelTCPMemoryLimit uint32 `protobuf:"varint,11,opt,name=kernelTCPMemoryLimit" json:"kernelTCPMemoryLimit,omitempty"` + MemoryLimit uint64 `protobuf:"varint,7,opt,name=memoryLimit" json:"memoryLimit,omitempty"` + MemorySwap uint64 `protobuf:"varint,8,opt,name=memorySwap" json:"memorySwap,omitempty"` + MemoryReservation uint64 `protobuf:"varint,9,opt,name=memoryReservation" json:"memoryReservation,omitempty"` + KernelMemoryLimit uint64 `protobuf:"varint,10,opt,name=kernelMemoryLimit" json:"kernelMemoryLimit,omitempty"` + KernelTCPMemoryLimit uint64 `protobuf:"varint,11,opt,name=kernelTCPMemoryLimit" json:"kernelTCPMemoryLimit,omitempty"` } func (m *UpdateResource) Reset() { *m = UpdateResource{} } @@ -1318,153 +1316,153 @@ var _API_serviceDesc = grpc.ServiceDesc{ } var fileDescriptor0 = []byte{ - // 2366 bytes of a gzipped FileDescriptorProto - 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x59, 0x4b, 0x73, 0x1c, 0x49, - 0xf1, 0xf7, 0x3c, 0xa5, 0xc9, 0x79, 0x48, 0x6a, 0xcb, 0xd2, 0x78, 0x76, 0xed, 0xf5, 0xbf, 0x63, - 0xff, 0x60, 0x60, 0x11, 0x66, 0xbc, 0x1b, 0x38, 0x20, 0x82, 0x08, 0x5b, 0x32, 0x8b, 0x59, 0xcb, - 0x8c, 0x5b, 0x12, 0x7b, 0x9c, 0x68, 0x75, 0x97, 0x67, 0x1a, 0xcd, 0x74, 0xf7, 0x76, 0xd7, 0x48, - 0xa3, 0x0b, 0x07, 0x0e, 0x70, 0xe3, 0x4c, 0x04, 0x04, 0x17, 0x6e, 0xdc, 0x39, 0xf0, 0x09, 0x88, - 0xe0, 0x83, 0x70, 0xe3, 0xce, 0x91, 0xac, 0xaa, 0xec, 0xea, 0xea, 0x79, 0x48, 0xe6, 0x40, 0x70, - 0xe1, 0x32, 0x51, 0xf9, 0xab, 0xac, 0xcc, 0xac, 0xac, 0xcc, 0xac, 0xec, 0x1a, 0x68, 0xb8, 0x71, - 0x70, 0x10, 0x27, 0x11, 0x8f, 0xac, 0x1a, 0xbf, 0x8e, 0x59, 0x6a, 0xdf, 0x87, 0xfd, 0xcf, 0x19, - 0x3f, 0x61, 0xc9, 0x25, 0x4b, 0x7e, 0xc6, 0x92, 0x34, 0x88, 0x42, 0x87, 0x7d, 0x35, 0x63, 0x29, - 0xb7, 0xe7, 0xd0, 0x5d, 0x9e, 0x4a, 0xe3, 0x28, 0x4c, 0x99, 0xb5, 0x0b, 0xb5, 0xa9, 0xfb, 0xf3, - 0x28, 0xe9, 0x96, 0x1e, 0x95, 0x1e, 0xb7, 0x1d, 0x45, 0x48, 0x34, 0x08, 0x11, 0x2d, 0x13, 0x2a, - 0x08, 0x81, 0xc6, 0x2e, 0xf7, 0xc6, 0xdd, 0x8a, 0x42, 0x25, 0x61, 0xf5, 0x60, 0x33, 0x61, 0x97, - 0x81, 0x90, 0xda, 0xad, 0xe2, 0x44, 0xc3, 0xd1, 0xb4, 0xfd, 0xab, 0x12, 0xec, 0x9e, 0xc5, 0xbe, - 0xcb, 0xd9, 0x20, 0x89, 0x3c, 0x96, 0xa6, 0x64, 0x92, 0xd5, 0x81, 0x72, 0xe0, 0x4b, 0x9d, 0x0d, - 0x07, 0x47, 0xd6, 0x36, 0x54, 0x62, 0x04, 0xca, 0x12, 0x10, 0x43, 0xeb, 0x21, 0x80, 0x37, 0x89, - 0x52, 0x76, 0xc2, 0xfd, 0x20, 0x94, 0x1a, 0x37, 0x1d, 0x03, 0x11, 0xc6, 0x5c, 0x05, 0x3e, 0x1f, - 0x4b, 0x9d, 0x68, 0x8c, 0x24, 0xac, 0x3d, 0xa8, 0x8f, 0x59, 0x30, 0x1a, 0xf3, 0x6e, 0x4d, 0xc2, - 0x44, 0xd9, 0xfb, 0x70, 0x6f, 0xc1, 0x0e, 0xb5, 0x7f, 0xfb, 0x6f, 0x65, 0xd8, 0x3b, 0x4c, 0x18, - 0xce, 0x1c, 0x46, 0x21, 0x77, 0x83, 0x90, 0x25, 0xeb, 0x6c, 0x44, 0x8b, 0xce, 0x67, 0xa1, 0x3f, - 0x61, 0x03, 0x17, 0xd5, 0x2a, 0x53, 0x0d, 0x44, 0x5a, 0x3c, 0x66, 0xde, 0x45, 0x1c, 0x05, 0x21, - 0x97, 0x16, 0xe3, 0x7c, 0x8e, 0x08, 0x8b, 0x53, 0xb9, 0x19, 0xe5, 0x25, 0x45, 0x08, 0x8b, 0x71, - 0x10, 0xcd, 0x94, 0xc5, 0x0d, 0x87, 0x28, 0xc2, 0x59, 0x92, 0x74, 0xeb, 0x1a, 0x47, 0x4a, 0xe0, - 0x13, 0xf7, 0x9c, 0x4d, 0xd2, 0xee, 0xc6, 0xa3, 0x8a, 0xc0, 0x15, 0x65, 0x3d, 0x82, 0x66, 0x18, - 0x0d, 0x82, 0xcb, 0x88, 0x3b, 0x51, 0xc4, 0xbb, 0x9b, 0xd2, 0x61, 0x26, 0x64, 0x75, 0x61, 0x23, - 0x99, 0x85, 0x3c, 0x98, 0xb2, 0x6e, 0x43, 0x8a, 0xcc, 0x48, 0xb1, 0x96, 0x86, 0xcf, 0x93, 0x51, - 0xda, 0x05, 0x29, 0xd8, 0x84, 0xac, 0x8f, 0xa1, 0x9d, 0xef, 0xe4, 0x28, 0x48, 0xba, 0x4d, 0x29, - 0xa1, 0x08, 0xda, 0xaf, 0x60, 0x7f, 0xc9, 0x97, 0x14, 0x67, 0x07, 0xd0, 0xf0, 0x32, 0x50, 0xfa, - 0xb4, 0xd9, 0xdf, 0x3e, 0x90, 0x91, 0x7b, 0x90, 0x33, 0xe7, 0x2c, 0x28, 0xaa, 0x7d, 0x12, 0x8c, - 0x42, 0x77, 0xf2, 0xfe, 0x11, 0x23, 0x3c, 0x26, 0x97, 0x50, 0x7c, 0x12, 0x65, 0x6f, 0x43, 0x27, - 0x13, 0x45, 0x87, 0xfe, 0xe7, 0x0a, 0xec, 0x3c, 0xf7, 0xfd, 0x5b, 0x62, 0x12, 0x03, 0x9b, 0xb3, - 0x04, 0x43, 0x1f, 0x25, 0x96, 0xa5, 0x3b, 0x35, 0x6d, 0x7d, 0x04, 0xd5, 0x59, 0x8a, 0x3b, 0xa9, - 0xc8, 0x9d, 0x34, 0x69, 0x27, 0x67, 0x08, 0x39, 0x72, 0xc2, 0xb2, 0xa0, 0xea, 0x0a, 0x5f, 0x56, - 0xa5, 0x2f, 0xe5, 0x58, 0x98, 0xcc, 0xc2, 0x4b, 0x3c, 0x67, 0x01, 0x89, 0xa1, 0x40, 0xbc, 0x2b, - 0x9f, 0x4e, 0x58, 0x0c, 0xb3, 0x6d, 0x6d, 0xe4, 0xdb, 0xd2, 0x61, 0xb3, 0xb9, 0x3a, 0x6c, 0x1a, - 0x6b, 0xc2, 0x06, 0x0a, 0x61, 0x63, 0x43, 0xcb, 0x73, 0x63, 0xf7, 0x3c, 0x98, 0x04, 0x3c, 0x60, - 0x29, 0x9e, 0x9f, 0x30, 0xa2, 0x80, 0x59, 0x8f, 0x61, 0xcb, 0x8d, 0x63, 0x37, 0x99, 0x46, 0x09, - 0xba, 0xe6, 0x5d, 0x30, 0x61, 0xdd, 0x96, 0x14, 0xb2, 0x08, 0x0b, 0x69, 0x29, 0x9b, 0x04, 0xe1, - 0x6c, 0xfe, 0x5a, 0x44, 0x5f, 0xb7, 0x2d, 0xd9, 0x0a, 0x98, 0x90, 0x16, 0x46, 0x6f, 0xd8, 0xd5, - 0x20, 0x09, 0x2e, 0x71, 0xcd, 0x08, 0x95, 0x76, 0xa4, 0x17, 0x17, 0x61, 0xeb, 0xeb, 0x18, 0x98, - 0x93, 0x60, 0x1a, 0xf0, 0xb4, 0xbb, 0x85, 0x66, 0x35, 0xfb, 0x6d, 0xf2, 0xa7, 0x23, 0x51, 0x27, - 0x9b, 0xb5, 0x8f, 0xa0, 0xae, 0x20, 0xe1, 0x5e, 0xc1, 0x42, 0xa7, 0x25, 0xc7, 0x02, 0x4b, 0xa3, - 0x77, 0x5c, 0x9e, 0x55, 0xd5, 0x91, 0x63, 0x81, 0x8d, 0xdd, 0xc4, 0x97, 0xe7, 0x84, 0x98, 0x18, - 0xdb, 0x0e, 0x54, 0xc5, 0x41, 0x09, 0x57, 0xcf, 0xe8, 0xc0, 0xdb, 0x8e, 0x18, 0x0a, 0x64, 0x44, - 0x31, 0x85, 0x08, 0x0e, 0xad, 0xaf, 0x41, 0xc7, 0xf5, 0x7d, 0x74, 0x4f, 0x84, 0xa7, 0xfe, 0x79, - 0xe0, 0xa7, 0x28, 0xa9, 0x82, 0x93, 0x0b, 0xa8, 0xbd, 0x0b, 0x96, 0x19, 0x50, 0x14, 0x67, 0xbf, - 0x2c, 0xe9, 0x84, 0xd0, 0x79, 0xb2, 0x2e, 0xda, 0xbe, 0x5b, 0xa8, 0x1e, 0x65, 0x19, 0x57, 0x3b, - 0x59, 0x86, 0xe4, 0xab, 0xcd, 0x82, 0xb2, 0x94, 0x94, 0x95, 0x55, 0x49, 0xd9, 0x83, 0xee, 0xb2, - 0x0d, 0x64, 0xa0, 0x07, 0xfb, 0x47, 0x6c, 0xc2, 0xde, 0xc7, 0x3e, 0xf4, 0x64, 0xe8, 0x62, 0xe9, - 0x50, 0x09, 0x27, 0xc7, 0xef, 0x6f, 0xc0, 0xb2, 0x12, 0x32, 0xe0, 0x18, 0xee, 0xbd, 0x0e, 0x52, - 0x7e, 0xbb, 0xfa, 0x25, 0x55, 0xe5, 0x55, 0xaa, 0x7e, 0x5b, 0x02, 0xc8, 0x65, 0x69, 0x9b, 0x4b, - 0x86, 0xcd, 0x88, 0xb1, 0x79, 0xc0, 0x29, 0xa3, 0xe5, 0x58, 0x9c, 0x3b, 0xf7, 0x62, 0xba, 0x64, - 0xc4, 0x50, 0x54, 0xc4, 0x59, 0x18, 0xcc, 0x4f, 0x22, 0xef, 0x82, 0xf1, 0x54, 0x56, 0x6c, 0xac, - 0xa6, 0x06, 0x24, 0xd3, 0x72, 0xcc, 0x26, 0x13, 0x59, 0xb6, 0x37, 0x1d, 0x45, 0x88, 0x1a, 0xcb, - 0xa6, 0x31, 0xbf, 0x7e, 0x73, 0x82, 0x49, 0x2d, 0x32, 0x2c, 0x23, 0x71, 0xa7, 0x7b, 0x8b, 0x3b, - 0xa5, 0xd2, 0xf8, 0x14, 0x9a, 0xf9, 0x2e, 0x52, 0x34, 0xb6, 0xb2, 0xfa, 0xe8, 0x4d, 0x2e, 0xfb, - 0x21, 0xb4, 0x4e, 0x38, 0x1e, 0xea, 0x1a, 0x7f, 0xd9, 0x8f, 0xa1, 0xa3, 0xeb, 0xaa, 0x64, 0x54, - 0x95, 0xc1, 0xe5, 0xb3, 0x94, 0xb8, 0x88, 0xb2, 0xff, 0x52, 0x81, 0x0d, 0x0a, 0xdc, 0xac, 0xfa, - 0x94, 0xf2, 0xea, 0xf3, 0x5f, 0x29, 0x82, 0x1f, 0x42, 0x23, 0xbd, 0x4e, 0x39, 0x9b, 0x0e, 0xa8, - 0x14, 0xb6, 0x9d, 0x1c, 0xf8, 0x5f, 0x41, 0xcc, 0x0b, 0xe2, 0x5f, 0x4b, 0xd0, 0xd0, 0xc7, 0xfc, - 0x6f, 0x37, 0x2c, 0x9f, 0x40, 0x23, 0x56, 0x07, 0xcf, 0x54, 0x5d, 0x6b, 0xf6, 0x3b, 0xa4, 0x28, - 0xab, 0x64, 0x39, 0x83, 0x11, 0x3f, 0x55, 0x33, 0x7e, 0x8c, 0x86, 0xa4, 0x56, 0x68, 0x48, 0xf0, - 0xf0, 0x63, 0x51, 0x30, 0xeb, 0xb2, 0x60, 0xca, 0xb1, 0xd9, 0x82, 0x6c, 0x14, 0x5a, 0x10, 0xfb, - 0x33, 0xd8, 0x38, 0x76, 0xbd, 0x31, 0xee, 0x43, 0x2c, 0xf4, 0x62, 0x0a, 0x53, 0x5c, 0x28, 0xc6, - 0x42, 0xc9, 0x94, 0xa1, 0xbf, 0xaf, 0xa9, 0xba, 0x13, 0x65, 0x5f, 0x60, 0x9b, 0xa0, 0xd2, 0x80, - 0x92, 0xe9, 0x09, 0x96, 0xd1, 0xcc, 0x21, 0x59, 0x2e, 0x2d, 0x37, 0x1a, 0x06, 0x0f, 0x1e, 0xcb, - 0xc6, 0x54, 0x69, 0xa6, 0xaa, 0x9b, 0xf9, 0x80, 0xec, 0x71, 0xb2, 0x69, 0xfb, 0xd7, 0x25, 0xd8, - 0x53, 0x5d, 0xe4, 0xad, 0xbd, 0xe2, 0xea, 0xee, 0x44, 0xb9, 0xaf, 0x52, 0x70, 0xdf, 0x53, 0x68, - 0x24, 0x2c, 0x8d, 0x66, 0x09, 0xba, 0x59, 0x7a, 0xb6, 0xd9, 0xbf, 0x97, 0x65, 0x92, 0xd4, 0xe5, - 0xd0, 0xac, 0x93, 0xf3, 0xd9, 0xbf, 0xaf, 0x40, 0xa7, 0x38, 0x2b, 0x2a, 0xd6, 0xf9, 0xe4, 0x22, - 0x88, 0xbe, 0x54, 0xed, 0xaf, 0x72, 0x9e, 0x09, 0x89, 0xac, 0x42, 0x5f, 0x9e, 0xe0, 0x1d, 0x88, - 0x9a, 0xd4, 0x1d, 0x97, 0x03, 0x34, 0x3b, 0x60, 0x49, 0x10, 0xf9, 0xd4, 0x40, 0xe5, 0x80, 0x28, - 0x03, 0x48, 0xbc, 0x9d, 0x45, 0xdc, 0xa5, 0x86, 0x5b, 0xd3, 0xb2, 0xef, 0xc5, 0x33, 0x62, 0xfc, - 0x50, 0x9c, 0x5a, 0x8d, 0xfa, 0x5e, 0x8d, 0xe4, 0xf3, 0xc7, 0x6c, 0x9a, 0x52, 0x9a, 0x1b, 0x88, - 0xb0, 0x5c, 0x9d, 0xe6, 0x6b, 0x11, 0xd4, 0x94, 0xef, 0x26, 0x24, 0x24, 0x28, 0xf2, 0xe4, 0xca, - 0x8d, 0x65, 0xda, 0xb7, 0x1d, 0x03, 0xc1, 0x40, 0xde, 0x51, 0x14, 0x7a, 0x03, 0xbf, 0x72, 0x5c, - 0x71, 0x31, 0xcb, 0x32, 0xd0, 0x76, 0x96, 0x27, 0x04, 0xf7, 0x05, 0x4b, 0x42, 0x36, 0x39, 0x36, - 0xb4, 0x82, 0xe2, 0x5e, 0x9a, 0xb0, 0xfa, 0xb0, 0xab, 0xc0, 0xd3, 0xc3, 0x81, 0xb9, 0xa0, 0x29, - 0x17, 0xac, 0x9c, 0x13, 0xdf, 0x62, 0x4b, 0x71, 0x42, 0x17, 0xde, 0xb7, 0xa1, 0xfd, 0xf2, 0x92, - 0x61, 0x05, 0xcf, 0x22, 0x07, 0xfd, 0x2e, 0x12, 0x00, 0xa3, 0x61, 0x1a, 0xcb, 0x53, 0xab, 0x3a, - 0x39, 0x60, 0xa7, 0x50, 0x93, 0xec, 0x2b, 0x1b, 0x1e, 0x15, 0x74, 0x65, 0x1d, 0x74, 0xc5, 0x10, - 0x6b, 0xeb, 0x10, 0xa3, 0x60, 0xac, 0xe6, 0xc1, 0x58, 0x50, 0x5a, 0x5b, 0x54, 0xfa, 0x9b, 0x32, - 0xb4, 0xde, 0x30, 0x7e, 0x15, 0x25, 0x17, 0x22, 0xb9, 0xd2, 0x95, 0xf7, 0xe8, 0x7d, 0xfc, 0xec, - 0x9b, 0x0f, 0xcf, 0xaf, 0x39, 0x05, 0x53, 0x15, 0x73, 0x79, 0xfe, 0x42, 0x90, 0xd6, 0x03, 0x00, - 0x9c, 0x1a, 0xb8, 0xea, 0xee, 0x54, 0xad, 0x57, 0x23, 0x99, 0x13, 0x60, 0x7d, 0x00, 0x0d, 0x67, - 0x3e, 0xc4, 0x1a, 0x1c, 0x25, 0x2a, 0xe2, 0xab, 0xf8, 0xc5, 0x38, 0x7f, 0x29, 0x69, 0xb1, 0x16, - 0x27, 0xfd, 0x24, 0x8a, 0x63, 0xe6, 0x67, 0xa6, 0x25, 0xf3, 0x23, 0x05, 0x08, 0xad, 0xa7, 0x99, - 0xd6, 0xba, 0xd2, 0xca, 0x73, 0xad, 0x38, 0x15, 0x93, 0xd6, 0x0d, 0xda, 0x94, 0xa9, 0xf5, 0x54, - 0x6b, 0xdd, 0x54, 0x5a, 0xb9, 0xa1, 0xf5, 0x34, 0xd7, 0xda, 0xc8, 0xd6, 0x92, 0x56, 0xfb, 0x4f, - 0x25, 0xd8, 0xc4, 0x50, 0x3e, 0x4b, 0xdd, 0x11, 0xc3, 0x5b, 0xaf, 0xc9, 0x31, 0xec, 0x27, 0xc3, - 0x99, 0x20, 0xe9, 0xc8, 0x40, 0x42, 0x8a, 0xe1, 0xff, 0xa0, 0x15, 0xb3, 0x04, 0x03, 0x9c, 0x38, - 0xca, 0x58, 0x84, 0xaa, 0x4e, 0x53, 0x61, 0x8a, 0xe5, 0x00, 0xee, 0xca, 0xb9, 0x61, 0x10, 0x0e, - 0x55, 0x04, 0x4d, 0x23, 0x9f, 0x91, 0xab, 0x76, 0xe4, 0xd4, 0xab, 0xf0, 0x0b, 0x3d, 0x61, 0x7d, - 0x13, 0x76, 0x34, 0xbf, 0xb8, 0x59, 0x25, 0xb7, 0x72, 0xdd, 0x16, 0x71, 0x9f, 0x11, 0x6c, 0xff, - 0x02, 0x3a, 0xa7, 0xe3, 0x24, 0xe2, 0x1c, 0xaf, 0x9e, 0xd1, 0x91, 0x8b, 0x09, 0x8a, 0x55, 0x37, - 0x96, 0x69, 0x9c, 0x92, 0xb5, 0x19, 0x69, 0x7d, 0x0b, 0x76, 0xb8, 0xe2, 0x65, 0xfe, 0x30, 0xe3, - 0x51, 0xa7, 0xb9, 0xad, 0x27, 0x06, 0xc4, 0xfc, 0xff, 0xd0, 0xc9, 0x99, 0x65, 0x0d, 0x57, 0xf6, - 0xb6, 0x35, 0x7a, 0x2a, 0x2a, 0xf9, 0xef, 0x94, 0xb3, 0x54, 0xe4, 0x7c, 0x22, 0xab, 0x8a, 0xe1, - 0xaa, 0x66, 0x7f, 0x2b, 0xab, 0xc6, 0xe4, 0x0c, 0x59, 0x49, 0x94, 0x5b, 0x7e, 0x08, 0x5b, 0x5c, - 0x9b, 0x3e, 0xc4, 0x04, 0x72, 0xa9, 0x24, 0x67, 0x15, 0xb1, 0xb8, 0x31, 0xa7, 0xc3, 0x8b, 0x1b, - 0x45, 0xcf, 0xab, 0x36, 0x81, 0x14, 0x2a, 0xfb, 0x9a, 0x0a, 0x93, 0x2a, 0xec, 0x1f, 0x40, 0x03, - 0x7b, 0x88, 0x54, 0x59, 0x87, 0x8e, 0xf1, 0x66, 0x49, 0x82, 0xf9, 0x95, 0x39, 0x86, 0x48, 0xd1, - 0x63, 0xc8, 0x2b, 0x96, 0x9c, 0xa1, 0x08, 0x3b, 0x02, 0x50, 0x69, 0x2e, 0xb5, 0x21, 0x8f, 0x19, - 0x02, 0x8a, 0x10, 0x71, 0x36, 0x75, 0xe7, 0xfa, 0xe8, 0x65, 0x9c, 0x21, 0xa0, 0x36, 0x88, 0x0a, - 0xdf, 0xb9, 0xc1, 0xc4, 0xa3, 0xf7, 0x01, 0x54, 0x48, 0x64, 0xae, 0xb0, 0x6a, 0x2a, 0xfc, 0x63, - 0x19, 0x9a, 0x4a, 0xa3, 0x32, 0x18, 0xb9, 0x3c, 0xbc, 0x8c, 0xb4, 0x4a, 0x49, 0x60, 0xbb, 0x50, - 0xcb, 0xd5, 0xe5, 0xad, 0x63, 0x6e, 0x6a, 0x66, 0x1b, 0x5e, 0x8e, 0x29, 0xd6, 0x4b, 0xc3, 0x3b, - 0x2b, 0xb9, 0x1b, 0x82, 0x49, 0x19, 0xfc, 0x29, 0xb4, 0x54, 0x7c, 0xd2, 0x9a, 0xea, 0xba, 0x35, - 0x4d, 0xc5, 0xa6, 0x56, 0x3d, 0x15, 0x1d, 0x1a, 0xda, 0x2b, 0x3b, 0x82, 0x66, 0xff, 0x41, 0x81, - 0x5d, 0xee, 0xe4, 0x40, 0xfe, 0xbe, 0x0c, 0x39, 0x96, 0x66, 0xc5, 0xdb, 0x7b, 0x06, 0x90, 0x83, - 0xa2, 0x66, 0x5d, 0xb0, 0xeb, 0xac, 0x13, 0xc5, 0xa1, 0xd8, 0xfb, 0xa5, 0x3b, 0x99, 0x65, 0x4e, - 0x55, 0xc4, 0xf7, 0xcb, 0xcf, 0x4a, 0xf8, 0x15, 0xb3, 0xf5, 0x42, 0xdc, 0x73, 0xc6, 0xf2, 0xc2, - 0xb3, 0x56, 0x75, 0xe5, 0xb3, 0x56, 0x35, 0x7b, 0xd6, 0xc2, 0x32, 0x1a, 0xc5, 0x74, 0x2b, 0xe3, - 0x28, 0x57, 0x54, 0x35, 0x14, 0xd9, 0x7f, 0xaf, 0x02, 0xe4, 0x5a, 0xac, 0x13, 0xe8, 0x05, 0xd1, - 0x50, 0x5c, 0x2a, 0x81, 0xc7, 0x54, 0x41, 0x1a, 0x26, 0x0c, 0xc3, 0x27, 0x0d, 0x2e, 0x19, 0xf5, - 0x1d, 0x7b, 0xb4, 0xef, 0x05, 0xe3, 0x9c, 0x7d, 0xa4, 0xd4, 0x42, 0x59, 0xb9, 0x9c, 0x6c, 0x99, - 0xf5, 0x13, 0xb8, 0x97, 0x0b, 0xf5, 0x0d, 0x79, 0xe5, 0x1b, 0xe5, 0xdd, 0xd5, 0xf2, 0xfc, 0x5c, - 0xd6, 0x8f, 0x00, 0xe1, 0x21, 0xde, 0x31, 0xb3, 0x82, 0xa4, 0xca, 0x8d, 0x92, 0x76, 0x82, 0xe8, - 0xad, 0x5c, 0x91, 0xcb, 0x79, 0x0b, 0xf7, 0x8d, 0x8d, 0x8a, 0xb4, 0x37, 0xa4, 0x55, 0x6f, 0x94, - 0xb6, 0xa7, 0xed, 0x12, 0x85, 0x21, 0x17, 0xf9, 0x05, 0xe0, 0xcc, 0xf0, 0xca, 0x0d, 0xf8, 0xa2, - 0xbc, 0xda, 0x6d, 0xfb, 0xfc, 0x12, 0x17, 0x15, 0x85, 0xa9, 0x7d, 0x4e, 0x59, 0x32, 0x2a, 0xec, - 0xb3, 0x7e, 0xdb, 0x3e, 0x8f, 0xe5, 0x8a, 0x5c, 0xce, 0x0b, 0x40, 0x70, 0xd1, 0x9e, 0x8d, 0x1b, - 0xa5, 0x6c, 0x05, 0x51, 0xd1, 0x96, 0x43, 0xd8, 0x49, 0x99, 0xc7, 0xf1, 0x46, 0x31, 0x64, 0x6c, - 0xde, 0x28, 0x63, 0x9b, 0x16, 0x68, 0x21, 0xf6, 0x57, 0xd0, 0xfa, 0xf1, 0x6c, 0xc4, 0xf8, 0xe4, - 0x5c, 0xe7, 0xfc, 0x7f, 0xba, 0xcc, 0xfc, 0x13, 0xcb, 0xcc, 0xe1, 0x28, 0x89, 0x66, 0x71, 0xa1, - 0x6a, 0xab, 0x1c, 0x5e, 0xaa, 0xda, 0x92, 0x47, 0x56, 0x6d, 0xc5, 0xfd, 0x19, 0xb4, 0x54, 0x93, - 0x45, 0x0b, 0x54, 0x15, 0xb2, 0x96, 0x93, 0x3e, 0x6b, 0xea, 0xd4, 0xb2, 0x3e, 0x35, 0xac, 0xb4, - 0xaa, 0x58, 0x8d, 0x72, 0x37, 0xe1, 0x17, 0x4b, 0x9e, 0x75, 0xaf, 0xa0, 0x3d, 0x56, 0xbe, 0xa1, - 0x55, 0x2a, 0x00, 0x3f, 0xce, 0x8c, 0xcb, 0xf7, 0x70, 0x60, 0xfa, 0x50, 0xb9, 0xba, 0x35, 0x36, - 0xdd, 0xfa, 0x1d, 0x00, 0xf1, 0x49, 0x32, 0xcc, 0x0a, 0x95, 0xf9, 0x22, 0xa9, 0x6f, 0x08, 0xfc, - 0xfe, 0xc9, 0x86, 0xbd, 0x53, 0xd8, 0x59, 0x92, 0xb9, 0xa2, 0x4c, 0x7d, 0xc3, 0x2c, 0x53, 0xcd, - 0xfe, 0x5d, 0x12, 0x69, 0x2e, 0x35, 0x6b, 0xd7, 0x1f, 0x4a, 0xea, 0x0b, 0x46, 0x3f, 0x1a, 0x59, - 0xcf, 0xa0, 0x1d, 0xaa, 0xe6, 0x4b, 0x1f, 0x40, 0xc5, 0x10, 0x64, 0x36, 0x66, 0x4e, 0x2b, 0x34, - 0xdb, 0x34, 0x3c, 0x08, 0x4f, 0x7a, 0x60, 0xe5, 0x41, 0x18, 0xce, 0x71, 0x9a, 0x9e, 0x71, 0xda, - 0x85, 0x66, 0xb0, 0xb2, 0xd8, 0x0c, 0xd2, 0x43, 0xc3, 0xba, 0x57, 0xd2, 0xfe, 0x3f, 0xea, 0x50, - 0x79, 0x3e, 0x78, 0x65, 0x9d, 0xc1, 0xf6, 0xe2, 0x9f, 0x0c, 0xd6, 0x43, 0x52, 0xbd, 0xe6, 0x8f, - 0x89, 0xde, 0x47, 0x6b, 0xe7, 0xa9, 0x5b, 0xbe, 0x63, 0x39, 0xb0, 0xb5, 0xf0, 0xa4, 0x6c, 0x65, - 0xd7, 0xc9, 0xea, 0x67, 0xfb, 0xde, 0xc3, 0x75, 0xd3, 0xa6, 0xcc, 0x85, 0xf6, 0x5c, 0xcb, 0x5c, - 0xfd, 0x79, 0xa7, 0x65, 0xae, 0xeb, 0xea, 0xef, 0x58, 0xdf, 0x83, 0xba, 0x7a, 0x64, 0xb6, 0x76, - 0x89, 0xb7, 0xf0, 0x7c, 0xdd, 0xbb, 0xb7, 0x80, 0xea, 0x85, 0xaf, 0xa1, 0x5d, 0xf8, 0x67, 0xc2, - 0xfa, 0xa0, 0xa0, 0xab, 0xf8, 0x46, 0xdd, 0xfb, 0x70, 0xf5, 0xa4, 0x96, 0x76, 0x08, 0x90, 0xbf, - 0x43, 0x5a, 0x5d, 0xe2, 0x5e, 0x7a, 0xeb, 0xee, 0xdd, 0x5f, 0x31, 0xa3, 0x85, 0xe0, 0x51, 0x2e, - 0xbe, 0x18, 0x5a, 0x0b, 0x5e, 0x5d, 0x7c, 0xaf, 0xd3, 0x47, 0xb9, 0xf6, 0xa9, 0x51, 0x8a, 0x5d, - 0x7c, 0x07, 0xd4, 0x62, 0xd7, 0xbc, 0x42, 0x6a, 0xb1, 0x6b, 0x1f, 0x10, 0xef, 0x58, 0x3f, 0x85, - 0x4e, 0xf1, 0x61, 0xcd, 0xca, 0x9c, 0xb4, 0xf2, 0x65, 0xb1, 0xf7, 0x60, 0xcd, 0xac, 0x16, 0xf8, - 0x29, 0xd4, 0xd4, 0x8b, 0x59, 0x96, 0x72, 0xe6, 0x43, 0x5b, 0x6f, 0xb7, 0x08, 0xea, 0x55, 0x4f, - 0xa0, 0xae, 0x3e, 0xec, 0x74, 0x00, 0x14, 0xbe, 0xf3, 0x7a, 0x2d, 0x13, 0xb5, 0xef, 0x3c, 0x29, - 0x65, 0x7a, 0xd2, 0x82, 0x9e, 0x74, 0x95, 0x1e, 0xe3, 0x70, 0xce, 0xeb, 0xf2, 0x5f, 0xbf, 0xa7, - 0xff, 0x0a, 0x00, 0x00, 0xff, 0xff, 0x54, 0x60, 0xc5, 0x68, 0x02, 0x1c, 0x00, 0x00, + // 2361 bytes of a gzipped FileDescriptorProto + 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x09, 0x6e, 0x88, 0x02, 0xff, 0xec, 0x59, 0xcd, 0x73, 0x1b, 0x4b, + 0x11, 0x8f, 0xbe, 0xad, 0xd6, 0x87, 0xed, 0x8d, 0x3f, 0x14, 0xbd, 0x97, 0xbc, 0xb0, 0xf5, 0x80, + 0x00, 0x0f, 0x13, 0x94, 0xf7, 0x8a, 0x14, 0x54, 0x51, 0x95, 0xd8, 0xe1, 0x11, 0x5e, 0x1c, 0x94, + 0xb5, 0xcd, 0x3b, 0xaa, 0xd6, 0xab, 0x89, 0xb4, 0x58, 0xda, 0xdd, 0xec, 0x8e, 0x6c, 0xf9, 0xc2, + 0x81, 0x03, 0xdc, 0x38, 0x53, 0x05, 0xc5, 0x85, 0x1b, 0x77, 0x0e, 0xfc, 0x05, 0x54, 0xf1, 0x87, + 0x70, 0xe3, 0xce, 0x91, 0x9e, 0x9e, 0xd9, 0xd9, 0x59, 0x7d, 0xd8, 0xe1, 0x40, 0x71, 0x79, 0x17, + 0xd5, 0xf4, 0x6f, 0x7a, 0xba, 0x7b, 0xba, 0x7b, 0x7a, 0x7a, 0x47, 0x50, 0x77, 0x23, 0xff, 0x20, + 0x8a, 0x43, 0x1e, 0x5a, 0x15, 0x7e, 0x1d, 0xb1, 0xc4, 0xbe, 0x07, 0xfb, 0x9f, 0x33, 0x7e, 0xc2, + 0xe2, 0x4b, 0x16, 0xff, 0x82, 0xc5, 0x89, 0x1f, 0x06, 0x0e, 0x7b, 0x37, 0x63, 0x09, 0xb7, 0xe7, + 0xd0, 0x59, 0x9e, 0x4a, 0xa2, 0x30, 0x48, 0x98, 0xb5, 0x03, 0x95, 0xa9, 0xfb, 0xcb, 0x30, 0xee, + 0x14, 0x1e, 0x16, 0x1e, 0xb5, 0x1c, 0x49, 0x10, 0xea, 0x07, 0x88, 0x16, 0x15, 0x2a, 0x08, 0x81, + 0x46, 0x2e, 0xf7, 0xc6, 0x9d, 0x92, 0x44, 0x89, 0xb0, 0xba, 0xb0, 0x11, 0xb3, 0x4b, 0x5f, 0x48, + 0xed, 0x94, 0x71, 0xa2, 0xee, 0x68, 0xda, 0xfe, 0x4d, 0x01, 0x76, 0xce, 0xa2, 0xa1, 0xcb, 0x59, + 0x3f, 0x0e, 0x3d, 0x96, 0x24, 0xca, 0x24, 0xab, 0x0d, 0x45, 0x7f, 0x48, 0x3a, 0xeb, 0x0e, 0x8e, + 0xac, 0x2d, 0x28, 0x45, 0x08, 0x14, 0x09, 0x10, 0x43, 0xeb, 0x01, 0x80, 0x37, 0x09, 0x13, 0x76, + 0xc2, 0x87, 0x7e, 0x40, 0x1a, 0x37, 0x1c, 0x03, 0x11, 0xc6, 0x5c, 0xf9, 0x43, 0x3e, 0x26, 0x9d, + 0x68, 0x0c, 0x11, 0xd6, 0x1e, 0x54, 0xc7, 0xcc, 0x1f, 0x8d, 0x79, 0xa7, 0x42, 0xb0, 0xa2, 0xec, + 0x7d, 0xd8, 0x5d, 0xb0, 0x43, 0xee, 0xdf, 0xfe, 0x47, 0x11, 0xf6, 0x0e, 0x63, 0x86, 0x33, 0x87, + 0x61, 0xc0, 0x5d, 0x3f, 0x60, 0xf1, 0x3a, 0x1b, 0xd1, 0xa2, 0xf3, 0x59, 0x30, 0x9c, 0xb0, 0xbe, + 0x8b, 0x6a, 0xa5, 0xa9, 0x06, 0x42, 0x16, 0x8f, 0x99, 0x77, 0x11, 0x85, 0x7e, 0xc0, 0xc9, 0x62, + 0x9c, 0xcf, 0x10, 0x61, 0x71, 0x42, 0x9b, 0x91, 0x5e, 0x92, 0x84, 0xb0, 0x18, 0x07, 0xe1, 0x4c, + 0x5a, 0x5c, 0x77, 0x14, 0xa5, 0x70, 0x16, 0xc7, 0x9d, 0xaa, 0xc6, 0x91, 0x12, 0xf8, 0xc4, 0x3d, + 0x67, 0x93, 0xa4, 0x53, 0x7b, 0x58, 0x12, 0xb8, 0xa4, 0xac, 0x87, 0xd0, 0x08, 0xc2, 0xbe, 0x7f, + 0x19, 0x72, 0x27, 0x0c, 0x79, 0x67, 0x83, 0x1c, 0x66, 0x42, 0x56, 0x07, 0x6a, 0xf1, 0x2c, 0xe0, + 0xfe, 0x94, 0x75, 0xea, 0x24, 0x32, 0x25, 0xc5, 0x5a, 0x35, 0x7c, 0x16, 0x8f, 0x92, 0x0e, 0x90, + 0x60, 0x13, 0xb2, 0x3e, 0x86, 0x56, 0xb6, 0x93, 0x23, 0x3f, 0xee, 0x34, 0x48, 0x42, 0x1e, 0xb4, + 0x5f, 0xc2, 0xfe, 0x92, 0x2f, 0x55, 0x9e, 0x1d, 0x40, 0xdd, 0x4b, 0x41, 0xf2, 0x69, 0xa3, 0xb7, + 0x75, 0x40, 0x99, 0x7b, 0x90, 0x31, 0x67, 0x2c, 0x28, 0xaa, 0x75, 0xe2, 0x8f, 0x02, 0x77, 0xf2, + 0xfe, 0x19, 0x23, 0x3c, 0x46, 0x4b, 0x54, 0x7e, 0x2a, 0xca, 0xde, 0x82, 0x76, 0x2a, 0x4a, 0x05, + 0xfd, 0xaf, 0x25, 0xd8, 0x7e, 0x36, 0x1c, 0xde, 0x92, 0x93, 0x98, 0xd8, 0x9c, 0xc5, 0x98, 0xfa, + 0x28, 0xb1, 0x48, 0xee, 0xd4, 0xb4, 0xf5, 0x11, 0x94, 0x67, 0x09, 0xee, 0xa4, 0x44, 0x3b, 0x69, + 0xa8, 0x9d, 0x9c, 0x21, 0xe4, 0xd0, 0x84, 0x65, 0x41, 0xd9, 0x15, 0xbe, 0x2c, 0x93, 0x2f, 0x69, + 0x2c, 0x4c, 0x66, 0xc1, 0x25, 0xc6, 0x59, 0x40, 0x62, 0x28, 0x10, 0xef, 0x6a, 0xa8, 0x22, 0x2c, + 0x86, 0xe9, 0xb6, 0x6a, 0xd9, 0xb6, 0x74, 0xda, 0x6c, 0xac, 0x4e, 0x9b, 0xfa, 0x9a, 0xb4, 0x81, + 0x5c, 0xda, 0xd8, 0xd0, 0xf4, 0xdc, 0xc8, 0x3d, 0xf7, 0x27, 0x3e, 0xf7, 0x59, 0x82, 0xf1, 0x13, + 0x46, 0xe4, 0x30, 0xeb, 0x11, 0x6c, 0xba, 0x51, 0xe4, 0xc6, 0xd3, 0x30, 0x46, 0xd7, 0xbc, 0xf5, + 0x27, 0xac, 0xd3, 0x24, 0x21, 0x8b, 0xb0, 0x90, 0x96, 0xb0, 0x89, 0x1f, 0xcc, 0xe6, 0xaf, 0x44, + 0xf6, 0x75, 0x5a, 0xc4, 0x96, 0xc3, 0x84, 0xb4, 0x20, 0x7c, 0xcd, 0xae, 0xfa, 0xb1, 0x7f, 0x89, + 0x6b, 0x46, 0xa8, 0xb4, 0x4d, 0x5e, 0x5c, 0x84, 0xad, 0x6f, 0x62, 0x62, 0x4e, 0xfc, 0xa9, 0xcf, + 0x93, 0xce, 0x26, 0x9a, 0xd5, 0xe8, 0xb5, 0x94, 0x3f, 0x1d, 0x42, 0x9d, 0x74, 0xd6, 0x3e, 0x82, + 0xaa, 0x84, 0x84, 0x7b, 0x05, 0x8b, 0x8a, 0x16, 0x8d, 0x05, 0x96, 0x84, 0x6f, 0x39, 0xc5, 0xaa, + 0xec, 0xd0, 0x58, 0x60, 0x63, 0x37, 0x1e, 0x52, 0x9c, 0x10, 0x13, 0x63, 0xdb, 0x81, 0xb2, 0x08, + 0x94, 0x70, 0xf5, 0x4c, 0x05, 0xbc, 0xe5, 0x88, 0xa1, 0x40, 0x46, 0x2a, 0xa7, 0x10, 0xc1, 0xa1, + 0xf5, 0x0d, 0x68, 0xbb, 0xc3, 0x21, 0xba, 0x27, 0xc4, 0xa8, 0x7f, 0xee, 0x0f, 0x13, 0x94, 0x54, + 0xc2, 0xc9, 0x05, 0xd4, 0xde, 0x01, 0xcb, 0x4c, 0x28, 0x95, 0x67, 0xbf, 0x2e, 0xe8, 0x03, 0xa1, + 0xcf, 0xc9, 0xba, 0x6c, 0xfb, 0x7e, 0xae, 0x7a, 0x14, 0x29, 0xaf, 0xb6, 0xd3, 0x13, 0x92, 0xad, + 0x36, 0x0b, 0xca, 0xd2, 0xa1, 0x2c, 0xad, 0x3a, 0x94, 0x5d, 0xe8, 0x2c, 0xdb, 0xa0, 0x0c, 0xf4, + 0x60, 0xff, 0x88, 0x4d, 0xd8, 0xfb, 0xd8, 0x87, 0x9e, 0x0c, 0x5c, 0x2c, 0x1d, 0xf2, 0xc0, 0xd1, + 0xf8, 0xfd, 0x0d, 0x58, 0x56, 0xa2, 0x0c, 0x38, 0x86, 0xdd, 0x57, 0x7e, 0xc2, 0x6f, 0x57, 0xbf, + 0xa4, 0xaa, 0xb8, 0x4a, 0xd5, 0xef, 0x0b, 0x00, 0x99, 0x2c, 0x6d, 0x73, 0xc1, 0xb0, 0x19, 0x31, + 0x36, 0xf7, 0xb9, 0x3a, 0xd1, 0x34, 0x16, 0x71, 0xe7, 0x5e, 0xa4, 0x2e, 0x19, 0x31, 0x14, 0x15, + 0x71, 0x16, 0xf8, 0xf3, 0x93, 0xd0, 0xbb, 0x60, 0x3c, 0xa1, 0x8a, 0x8d, 0xd5, 0xd4, 0x80, 0xe8, + 0x58, 0x8e, 0xd9, 0x64, 0x42, 0x65, 0x7b, 0xc3, 0x91, 0x84, 0xa8, 0xb1, 0x6c, 0x1a, 0xf1, 0xeb, + 0xd7, 0x27, 0x78, 0xa8, 0xc5, 0x09, 0x4b, 0x49, 0xdc, 0xe9, 0xde, 0xe2, 0x4e, 0x55, 0x69, 0x7c, + 0x02, 0x8d, 0x6c, 0x17, 0x09, 0x1a, 0x5b, 0x5a, 0x1d, 0x7a, 0x93, 0xcb, 0x7e, 0x00, 0xcd, 0x13, + 0x8e, 0x41, 0x5d, 0xe3, 0x2f, 0xfb, 0x11, 0xb4, 0x75, 0x5d, 0x25, 0x46, 0x59, 0x19, 0x5c, 0x3e, + 0x4b, 0x14, 0x97, 0xa2, 0xec, 0xbf, 0x95, 0xa0, 0xa6, 0x12, 0x37, 0xad, 0x3e, 0x85, 0xac, 0xfa, + 0xfc, 0x5f, 0x8a, 0xe0, 0x87, 0x50, 0x4f, 0xae, 0x13, 0xce, 0xa6, 0x7d, 0x55, 0x0a, 0x5b, 0x4e, + 0x06, 0x7c, 0x55, 0x10, 0xb3, 0x82, 0xf8, 0xf7, 0x02, 0xd4, 0x75, 0x98, 0xff, 0xeb, 0x86, 0xe5, + 0x13, 0xa8, 0x47, 0x32, 0xf0, 0x4c, 0xd6, 0xb5, 0x46, 0xaf, 0xad, 0x14, 0xa5, 0x95, 0x2c, 0x63, + 0x30, 0xf2, 0xa7, 0x6c, 0xe6, 0x8f, 0xd1, 0x90, 0x54, 0x72, 0x0d, 0x09, 0x06, 0x3f, 0x12, 0x05, + 0xb3, 0x4a, 0x05, 0x93, 0xc6, 0x66, 0x0b, 0x52, 0xcb, 0xb5, 0x20, 0xf6, 0x67, 0x50, 0x3b, 0x76, + 0xbd, 0x31, 0xee, 0x43, 0x2c, 0xf4, 0x22, 0x95, 0xa6, 0xb8, 0x50, 0x8c, 0x85, 0x92, 0x29, 0x43, + 0x7f, 0x5f, 0xab, 0xea, 0xae, 0x28, 0xfb, 0x02, 0xdb, 0x04, 0x79, 0x0c, 0xd4, 0x61, 0x7a, 0x8c, + 0x65, 0x34, 0x75, 0x48, 0x7a, 0x96, 0x96, 0x1b, 0x0d, 0x83, 0x07, 0xc3, 0x52, 0x9b, 0x4a, 0xcd, + 0xaa, 0xea, 0xa6, 0x3e, 0x50, 0xf6, 0x38, 0xe9, 0xb4, 0xfd, 0xdb, 0x02, 0xec, 0xc9, 0x2e, 0xf2, + 0xd6, 0x5e, 0x71, 0x75, 0x77, 0x22, 0xdd, 0x57, 0xca, 0xb9, 0xef, 0x09, 0xd4, 0x63, 0x96, 0x84, + 0xb3, 0x18, 0xdd, 0x4c, 0x9e, 0x6d, 0xf4, 0x76, 0xd3, 0x93, 0x44, 0xba, 0x1c, 0x35, 0xeb, 0x64, + 0x7c, 0xf6, 0x1f, 0x4b, 0xd0, 0xce, 0xcf, 0x8a, 0x8a, 0x75, 0x3e, 0xb9, 0xf0, 0xc3, 0x2f, 0x65, + 0xfb, 0x5b, 0x20, 0x37, 0x99, 0x90, 0x38, 0x55, 0xe8, 0xcb, 0x13, 0xbc, 0x03, 0x51, 0x93, 0x74, + 0x63, 0x06, 0xa8, 0xd9, 0x3e, 0x8b, 0xfd, 0x30, 0xbd, 0x2e, 0x33, 0x40, 0x94, 0x01, 0x24, 0xde, + 0xcc, 0x42, 0xee, 0x92, 0x91, 0x65, 0x47, 0xd3, 0xd4, 0xf7, 0x62, 0x8c, 0x18, 0x3f, 0x14, 0x51, + 0xab, 0xa8, 0xbe, 0x57, 0x23, 0xd9, 0xfc, 0x31, 0x9b, 0x26, 0xea, 0x98, 0x1b, 0x88, 0xb0, 0x5c, + 0x46, 0xf3, 0x95, 0x48, 0x6a, 0x4a, 0x0c, 0xb4, 0xdc, 0x80, 0x84, 0x04, 0x49, 0x9e, 0x5c, 0xb9, + 0x11, 0x1d, 0xfb, 0xb2, 0x63, 0x20, 0x98, 0xc8, 0xdb, 0x92, 0x42, 0x6f, 0xe0, 0x57, 0x8e, 0x2b, + 0x2e, 0x66, 0x2a, 0x03, 0x65, 0x67, 0x79, 0x42, 0x70, 0x5f, 0xb0, 0x38, 0x60, 0x93, 0x63, 0x43, + 0x2b, 0x48, 0xee, 0xa5, 0x09, 0xab, 0x07, 0x3b, 0x12, 0x3c, 0x3d, 0xec, 0x9b, 0x0b, 0x1a, 0xb4, + 0x60, 0xe5, 0x9c, 0xf8, 0x16, 0x5b, 0xca, 0x13, 0x75, 0xe1, 0x7d, 0x17, 0x5a, 0x2f, 0x2e, 0x19, + 0x56, 0xf0, 0x34, 0x73, 0xd0, 0xef, 0xe2, 0x00, 0x60, 0x36, 0x4c, 0x23, 0x15, 0xb5, 0x0c, 0xb0, + 0x13, 0xa8, 0x10, 0xfb, 0xca, 0x86, 0x47, 0x26, 0x5d, 0x51, 0x27, 0x5d, 0x3e, 0xc5, 0x5a, 0x3a, + 0xc5, 0x54, 0x32, 0x96, 0xb3, 0x64, 0xcc, 0x29, 0xad, 0x2c, 0x2a, 0xfd, 0x5d, 0x11, 0x9a, 0xaf, + 0x19, 0xbf, 0x0a, 0xe3, 0x0b, 0x71, 0xb8, 0x92, 0x95, 0xf7, 0xe8, 0x3d, 0xfc, 0xec, 0x9b, 0x0f, + 0xce, 0xaf, 0xb9, 0x4e, 0xa6, 0x5a, 0x3c, 0x7f, 0x2e, 0x48, 0xeb, 0x3e, 0x00, 0x4e, 0xf5, 0x5d, + 0x79, 0x77, 0xaa, 0x5c, 0x8a, 0xe7, 0x0a, 0xb0, 0x3e, 0x80, 0xba, 0x33, 0x1f, 0x60, 0x0d, 0x0e, + 0xe3, 0x24, 0x4d, 0xa6, 0x78, 0xfe, 0x82, 0x68, 0xb1, 0x16, 0x27, 0x87, 0x71, 0x18, 0x45, 0x6c, + 0x98, 0x9a, 0x16, 0xcf, 0x8f, 0x24, 0x20, 0xb4, 0x9e, 0xa6, 0x5a, 0xab, 0x52, 0x2b, 0xcf, 0xb4, + 0xe2, 0x54, 0xa4, 0xb4, 0xd6, 0xd4, 0xa6, 0x4c, 0xad, 0xa7, 0x5a, 0xab, 0x4c, 0xa1, 0x0d, 0x6e, + 0x68, 0x3d, 0xcd, 0xb4, 0xd6, 0xd3, 0xb5, 0x4a, 0xab, 0xfd, 0x97, 0x02, 0x6c, 0x60, 0x2a, 0x9f, + 0x25, 0xee, 0x88, 0xe1, 0xad, 0xd7, 0xe0, 0x98, 0xf6, 0x93, 0xc1, 0x4c, 0x90, 0x2a, 0x64, 0x40, + 0x90, 0x64, 0xf8, 0x1a, 0x34, 0x23, 0x16, 0x63, 0x82, 0x2b, 0x8e, 0x22, 0x16, 0x21, 0x4c, 0x68, + 0x89, 0x49, 0x96, 0x03, 0xb8, 0x4b, 0x73, 0x03, 0x3f, 0x18, 0xc8, 0x0c, 0x9a, 0x86, 0x43, 0xa6, + 0x5c, 0xb5, 0x4d, 0x53, 0x2f, 0x83, 0x2f, 0xf4, 0x84, 0xf5, 0x6d, 0xd8, 0xd6, 0xfc, 0xe2, 0x66, + 0x25, 0x6e, 0xe9, 0xba, 0x4d, 0xc5, 0x7d, 0xa6, 0x60, 0xfb, 0x57, 0xd0, 0x3e, 0x1d, 0xc7, 0x21, + 0xe7, 0x78, 0xf5, 0x8c, 0x8e, 0x5c, 0x3c, 0xa0, 0x58, 0x75, 0x23, 0x3a, 0xc6, 0x89, 0xb2, 0x36, + 0x25, 0xad, 0xef, 0xc0, 0x36, 0x97, 0xbc, 0x6c, 0x38, 0x48, 0x79, 0x64, 0x34, 0xb7, 0xf4, 0x44, + 0x5f, 0x31, 0x7f, 0x1d, 0xda, 0x19, 0x33, 0xd5, 0x70, 0x69, 0x6f, 0x4b, 0xa3, 0xa7, 0xa2, 0x92, + 0xff, 0x41, 0x3a, 0x4b, 0x66, 0xce, 0x27, 0x54, 0x55, 0x0c, 0x57, 0x35, 0x7a, 0x9b, 0x69, 0x35, + 0x56, 0xce, 0xa0, 0x4a, 0x22, 0xdd, 0xf2, 0x63, 0xd8, 0xe4, 0xda, 0xf4, 0x01, 0x1e, 0x20, 0x57, + 0x95, 0xe4, 0xb4, 0x22, 0xe6, 0x37, 0xe6, 0xb4, 0x79, 0x7e, 0xa3, 0xe8, 0x79, 0xd9, 0x26, 0x28, + 0x85, 0xd2, 0xbe, 0x86, 0xc4, 0x48, 0x85, 0xfd, 0x23, 0xa8, 0x63, 0x0f, 0x91, 0x48, 0xeb, 0xd0, + 0x31, 0xde, 0x2c, 0x8e, 0xf1, 0x7c, 0xa5, 0x8e, 0x51, 0xa4, 0xe8, 0x31, 0xe8, 0x8a, 0x55, 0xce, + 0x90, 0x84, 0x1d, 0x02, 0xc8, 0x63, 0x4e, 0xda, 0x90, 0xc7, 0x4c, 0x01, 0x49, 0x88, 0x3c, 0x9b, + 0xba, 0x73, 0x1d, 0x7a, 0xca, 0x33, 0x04, 0xe4, 0x06, 0x51, 0xe1, 0x5b, 0xd7, 0x9f, 0x78, 0xea, + 0x7d, 0x00, 0x15, 0x2a, 0x32, 0x53, 0x58, 0x36, 0x15, 0xfe, 0xb9, 0x08, 0x0d, 0xa9, 0x51, 0x1a, + 0x8c, 0x5c, 0x1e, 0x5e, 0x46, 0x5a, 0x25, 0x11, 0xd8, 0x2e, 0x54, 0x32, 0x75, 0x59, 0xeb, 0x98, + 0x99, 0x9a, 0xda, 0x86, 0x97, 0x63, 0x82, 0xf5, 0xd2, 0xf0, 0xce, 0x4a, 0xee, 0xba, 0x60, 0x92, + 0x06, 0x7f, 0x0a, 0x4d, 0x99, 0x9f, 0x6a, 0x4d, 0x79, 0xdd, 0x9a, 0x86, 0x64, 0x93, 0xab, 0x9e, + 0x88, 0x0e, 0x0d, 0xed, 0xa5, 0x8e, 0xa0, 0xd1, 0xbb, 0x9f, 0x63, 0xa7, 0x9d, 0x1c, 0xd0, 0xef, + 0x8b, 0x80, 0x63, 0x69, 0x96, 0xbc, 0xdd, 0xa7, 0x00, 0x19, 0x28, 0x6a, 0xd6, 0x05, 0xbb, 0x4e, + 0x3b, 0x51, 0x1c, 0x8a, 0xbd, 0x5f, 0xba, 0x93, 0x59, 0xea, 0x54, 0x49, 0xfc, 0xb0, 0xf8, 0xb4, + 0x80, 0x5f, 0x31, 0x9b, 0xcf, 0xc5, 0x3d, 0x67, 0x2c, 0xcf, 0x3d, 0x6b, 0x95, 0x57, 0x3e, 0x6b, + 0x95, 0xd3, 0x67, 0x2d, 0x2c, 0xa3, 0x61, 0xa4, 0x6e, 0x65, 0x1c, 0x65, 0x8a, 0xca, 0x86, 0x22, + 0xfb, 0x9f, 0x65, 0x80, 0x4c, 0x8b, 0x75, 0x02, 0x5d, 0x3f, 0x1c, 0x88, 0x4b, 0xc5, 0xf7, 0x98, + 0x2c, 0x48, 0x83, 0x98, 0x61, 0xfa, 0x24, 0xfe, 0x25, 0x53, 0x7d, 0xc7, 0x9e, 0xda, 0xf7, 0x82, + 0x71, 0xce, 0x3e, 0x52, 0x72, 0x21, 0x55, 0x2e, 0x27, 0x5d, 0x66, 0xfd, 0x0c, 0x76, 0x33, 0xa1, + 0x43, 0x43, 0x5e, 0xf1, 0x46, 0x79, 0x77, 0xb5, 0xbc, 0x61, 0x26, 0xeb, 0x27, 0x80, 0xf0, 0x00, + 0xef, 0x98, 0x59, 0x4e, 0x52, 0xe9, 0x46, 0x49, 0xdb, 0x7e, 0xf8, 0x86, 0x56, 0x64, 0x72, 0xde, + 0xc0, 0x3d, 0x63, 0xa3, 0xe2, 0xd8, 0x1b, 0xd2, 0xca, 0x37, 0x4a, 0xdb, 0xd3, 0x76, 0x89, 0xc2, + 0x90, 0x89, 0xfc, 0x02, 0x70, 0x66, 0x70, 0xe5, 0xfa, 0x7c, 0x51, 0x5e, 0xe5, 0xb6, 0x7d, 0x7e, + 0x89, 0x8b, 0xf2, 0xc2, 0xe4, 0x3e, 0xa7, 0x2c, 0x1e, 0xe5, 0xf6, 0x59, 0xbd, 0x6d, 0x9f, 0xc7, + 0xb4, 0x22, 0x93, 0xf3, 0x1c, 0x10, 0x5c, 0xb4, 0xa7, 0x76, 0xa3, 0x94, 0x4d, 0x3f, 0xcc, 0xdb, + 0x72, 0x08, 0xdb, 0x09, 0xf3, 0x38, 0xde, 0x28, 0x86, 0x8c, 0x8d, 0x1b, 0x65, 0x6c, 0xa9, 0x05, + 0x5a, 0x88, 0xfd, 0x0e, 0x9a, 0x3f, 0x9d, 0x8d, 0x18, 0x9f, 0x9c, 0xeb, 0x33, 0xff, 0xbf, 0x2e, + 0x33, 0xff, 0xc6, 0x32, 0x73, 0x38, 0x8a, 0xc3, 0x59, 0x94, 0xab, 0xda, 0xf2, 0x0c, 0x2f, 0x55, + 0x6d, 0xe2, 0xa1, 0xaa, 0x2d, 0xb9, 0x3f, 0x83, 0xa6, 0x6c, 0xb2, 0xd4, 0x02, 0x59, 0x85, 0xac, + 0xe5, 0x43, 0x9f, 0x36, 0x75, 0x72, 0x59, 0x4f, 0x35, 0xac, 0x6a, 0x55, 0xbe, 0x1a, 0x65, 0x6e, + 0xc2, 0x2f, 0x96, 0xec, 0xd4, 0xbd, 0x84, 0xd6, 0x58, 0xfa, 0x46, 0xad, 0x92, 0x09, 0xf8, 0x71, + 0x6a, 0x5c, 0xb6, 0x87, 0x03, 0xd3, 0x87, 0xd2, 0xd5, 0xcd, 0xb1, 0xe9, 0xd6, 0xef, 0x01, 0x88, + 0x4f, 0x92, 0x41, 0x5a, 0xa8, 0xcc, 0x17, 0x49, 0x7d, 0x43, 0xe0, 0xf7, 0x4f, 0x3a, 0xec, 0x9e, + 0xc2, 0xf6, 0x92, 0xcc, 0x15, 0x65, 0xea, 0x5b, 0x66, 0x99, 0x6a, 0xf4, 0xee, 0x2a, 0x91, 0xe6, + 0x52, 0xb3, 0x76, 0xfd, 0xa9, 0x20, 0xbf, 0x60, 0xf4, 0xa3, 0x91, 0xf5, 0x14, 0x5a, 0x81, 0x6c, + 0xbe, 0x74, 0x00, 0x4a, 0x86, 0x20, 0xb3, 0x31, 0x73, 0x9a, 0x81, 0xd9, 0xa6, 0x61, 0x20, 0x3c, + 0xf2, 0xc0, 0xca, 0x40, 0x18, 0xce, 0x71, 0x1a, 0x9e, 0x11, 0xed, 0x5c, 0x33, 0x58, 0x5a, 0x6c, + 0x06, 0xd5, 0x43, 0xc3, 0xba, 0x57, 0xd2, 0xde, 0xbf, 0xaa, 0x50, 0x7a, 0xd6, 0x7f, 0x69, 0x9d, + 0xc1, 0xd6, 0xe2, 0x9f, 0x0c, 0xd6, 0x03, 0xa5, 0x7a, 0xcd, 0x1f, 0x13, 0xdd, 0x8f, 0xd6, 0xce, + 0xab, 0x6e, 0xf9, 0x8e, 0xe5, 0xc0, 0xe6, 0xc2, 0x93, 0xb2, 0x95, 0x5e, 0x27, 0xab, 0x9f, 0xed, + 0xbb, 0x0f, 0xd6, 0x4d, 0x9b, 0x32, 0x17, 0xda, 0x73, 0x2d, 0x73, 0xf5, 0xe7, 0x9d, 0x96, 0xb9, + 0xae, 0xab, 0xbf, 0x63, 0xfd, 0x00, 0xaa, 0xf2, 0x91, 0xd9, 0xda, 0x51, 0xbc, 0xb9, 0xe7, 0xeb, + 0xee, 0xee, 0x02, 0xaa, 0x17, 0xbe, 0x82, 0x56, 0xee, 0x9f, 0x09, 0xeb, 0x83, 0x9c, 0xae, 0xfc, + 0x1b, 0x75, 0xf7, 0xc3, 0xd5, 0x93, 0x5a, 0xda, 0x21, 0x40, 0xf6, 0x0e, 0x69, 0x75, 0x14, 0xf7, + 0xd2, 0x5b, 0x77, 0xf7, 0xde, 0x8a, 0x19, 0x2d, 0x04, 0x43, 0xb9, 0xf8, 0x62, 0x68, 0x2d, 0x78, + 0x75, 0xf1, 0xbd, 0x4e, 0x87, 0x72, 0xed, 0x53, 0x23, 0x89, 0x5d, 0x7c, 0x07, 0xd4, 0x62, 0xd7, + 0xbc, 0x42, 0x6a, 0xb1, 0x6b, 0x1f, 0x10, 0xef, 0x58, 0x3f, 0x87, 0x76, 0xfe, 0x61, 0xcd, 0x4a, + 0x9d, 0xb4, 0xf2, 0x65, 0xb1, 0x7b, 0x7f, 0xcd, 0xac, 0x16, 0xf8, 0x29, 0x54, 0xe4, 0x8b, 0x59, + 0x7a, 0xe4, 0xcc, 0x87, 0xb6, 0xee, 0x4e, 0x1e, 0xd4, 0xab, 0x1e, 0x43, 0x55, 0x7e, 0xd8, 0xe9, + 0x04, 0xc8, 0x7d, 0xe7, 0x75, 0x9b, 0x26, 0x6a, 0xdf, 0x79, 0x5c, 0x48, 0xf5, 0x24, 0x39, 0x3d, + 0xc9, 0x2a, 0x3d, 0x46, 0x70, 0xce, 0xab, 0xf4, 0xaf, 0xdf, 0x93, 0xff, 0x04, 0x00, 0x00, 0xff, + 0xff, 0xbf, 0xea, 0xc8, 0x11, 0x02, 0x1c, 0x00, 0x00, } diff --git a/api/grpc/types/api.proto b/api/grpc/types/api.proto index c02a58c..478f990 100644 --- a/api/grpc/types/api.proto +++ b/api/grpc/types/api.proto @@ -190,17 +190,17 @@ message UpdateContainerRequest { } message UpdateResource { - uint32 blkioWeight =1; - uint32 cpuShares = 2; - uint32 cpuPeriod = 3; - uint32 cpuQuota = 4; + uint64 blkioWeight =1; + uint64 cpuShares = 2; + uint64 cpuPeriod = 3; + uint64 cpuQuota = 4; string cpusetCpus = 5; string cpusetMems = 6; - uint32 memoryLimit = 7; - uint32 memorySwap = 8; - uint32 memoryReservation = 9; - uint32 kernelMemoryLimit = 10; - uint32 kernelTCPMemoryLimit = 11; + uint64 memoryLimit = 7; + uint64 memorySwap = 8; + uint64 memoryReservation = 9; + uint64 kernelMemoryLimit = 10; + uint64 kernelTCPMemoryLimit = 11; } message UpdateContainerResponse { diff --git a/ctr/container.go b/ctr/container.go index 7edb675..670ac7b 100644 --- a/ctr/container.go +++ b/ctr/container.go @@ -10,6 +10,7 @@ import ( "os" "os/signal" "path/filepath" + "strconv" "strings" "syscall" "text/tabwriter" @@ -576,32 +577,46 @@ var statsCommand = cli.Command{ }, } +func getUpdateCommandInt64Flag(context *cli.Context, name string) uint64 { + str := context.String(name) + if str == "" { + return 0 + } + + val, err := strconv.ParseUint(str, 0, 64) + if err != nil { + fatal(err.Error(), 1) + } + + return val +} + var updateCommand = cli.Command{ Name: "update", Usage: "update a containers resources", Flags: []cli.Flag{ - cli.IntFlag{ + cli.StringFlag{ Name: "memory-limit", }, - cli.IntFlag{ + cli.StringFlag{ Name: "memory-reservation", }, - cli.IntFlag{ + cli.StringFlag{ Name: "memory-swap", }, - cli.IntFlag{ + cli.StringFlag{ Name: "cpu-quota", }, - cli.IntFlag{ + cli.StringFlag{ Name: "cpu-period", }, - cli.IntFlag{ + cli.StringFlag{ Name: "kernel-limit", }, - cli.IntFlag{ + cli.StringFlag{ Name: "kernel-tcp-limit", }, - cli.IntFlag{ + cli.StringFlag{ Name: "blkio-weight", }, cli.StringFlag{ @@ -616,17 +631,17 @@ var updateCommand = cli.Command{ Id: context.Args().First(), } req.Resources = &types.UpdateResource{} - req.Resources.MemoryLimit = uint32(context.Int("memory-limit")) - req.Resources.MemoryReservation = uint32(context.Int("memory-reservation")) - req.Resources.MemorySwap = uint32(context.Int("memory-swap")) - req.Resources.BlkioWeight = uint32(context.Int("blkio-weight")) - req.Resources.CpuPeriod = uint32(context.Int("cpu-period")) - req.Resources.CpuQuota = uint32(context.Int("cpu-quota")) - req.Resources.CpuShares = uint32(context.Int("cpu-shares")) + req.Resources.MemoryLimit = getUpdateCommandInt64Flag(context, "memory-limit") + req.Resources.MemoryReservation = getUpdateCommandInt64Flag(context, "memory-reservation") + req.Resources.MemorySwap = getUpdateCommandInt64Flag(context, "memory-swap") + req.Resources.BlkioWeight = getUpdateCommandInt64Flag(context, "blkio-weight") + req.Resources.CpuPeriod = getUpdateCommandInt64Flag(context, "cpu-period") + req.Resources.CpuQuota = getUpdateCommandInt64Flag(context, "cpu-quota") + req.Resources.CpuShares = getUpdateCommandInt64Flag(context, "cpu-shares") req.Resources.CpusetCpus = context.String("cpuset-cpus") req.Resources.CpusetMems = context.String("cpuset-mems") - req.Resources.KernelMemoryLimit = uint32(context.Int("kernel-limit")) - req.Resources.KernelTCPMemoryLimit = uint32(context.Int("kernel-tcp-limit")) + req.Resources.KernelMemoryLimit = getUpdateCommandInt64Flag(context, "kernel-limit") + req.Resources.KernelTCPMemoryLimit = getUpdateCommandInt64Flag(context, "kernel-tcp-limit") c := getClient(context) if _, err := c.UpdateContainer(netcontext.Background(), req); err != nil { fatal(err.Error(), 1)