From 9d7eff04089326e96b5f90b49b8aacdc6dc88d02 Mon Sep 17 00:00:00 2001 From: plaurent Date: Tue, 4 Jun 2024 14:15:35 -0400 Subject: [PATCH 1/3] Add OOM adjustment flag to hostconfig via swarmctl cli Signed-off-by: plaurent Signed-off-by: Boris Bliznioukov --- api/api.pb.txt | 22 ++ api/specs.pb.go | 353 ++++++++++-------- api/specs.proto | 4 + api/types.proto | 3 + .../swarmctl/service/flagparser/container.go | 10 + .../cmd/swarmctl/service/flagparser/flags.go | 1 + swarmd/dockerexec/container.go | 1 + 7 files changed, 234 insertions(+), 160 deletions(-) diff --git a/api/api.pb.txt b/api/api.pb.txt index aa53182aab..2cf98a6151 100755 --- a/api/api.pb.txt +++ b/api/api.pb.txt @@ -5803,6 +5803,13 @@ file { type_name: ".docker.swarmkit.v1.ContainerSpec.Ulimit" json_name: "ulimits" } + field { + name: "oom_score_adj" + number: 30 + label: LABEL_OPTIONAL + type: TYPE_INT64 + json_name: "oomScoreAdj" + } nested_type { name: "LabelsEntry" field { @@ -11691,6 +11698,21 @@ file { weak_dependency: 2 syntax: "proto3" } +file { + name: "github.com/docker/swarmkit/api/test.proto" + package: "docker.swarmkit.v1" + message_type { + name: "TestService" + field { + name: "TestService" + number: 1 + label: LABEL_OPTIONAL + type: TYPE_UINT64 + json_name: "TestService" + } + } + syntax: "proto3" +} file { name: "github.com/docker/swarmkit/api/watch.proto" package: "docker.swarmkit.v1" diff --git a/api/specs.pb.go b/api/specs.pb.go index a789d5a95e..a12741879a 100644 --- a/api/specs.pb.go +++ b/api/specs.pb.go @@ -874,7 +874,8 @@ type ContainerSpec struct { CapabilityDrop []string `protobuf:"bytes,28,rep,name=capability_drop,json=capabilityDrop,proto3" json:"capability_drop,omitempty"` // Ulimits defines the list of ulimits to set in the container. This option // is equivalent to passing --ulimit to docker run. - Ulimits []*ContainerSpec_Ulimit `protobuf:"bytes,29,rep,name=ulimits,proto3" json:"ulimits,omitempty"` + Ulimits []*ContainerSpec_Ulimit `protobuf:"bytes,29,rep,name=ulimits,proto3" json:"ulimits,omitempty"` + OomScoreAdj int64 `protobuf:"varint,30,opt,name=oom_score_adj,json=oomScoreAdj,proto3" json:"oom_score_adj,omitempty"` } func (m *ContainerSpec) Reset() { *m = ContainerSpec{} } @@ -1429,166 +1430,168 @@ func init() { } var fileDescriptor_6589acc608f7d4fd = []byte{ - // 2537 bytes of a gzipped FileDescriptorProto + // 2563 bytes of a gzipped FileDescriptorProto 0x1f, 0x8b, 0x08, 0x00, 0x00, 0x00, 0x00, 0x00, 0x02, 0xff, 0xcc, 0x59, 0x41, 0x73, 0x1b, 0xb7, - 0x15, 0x26, 0x25, 0x8a, 0x22, 0xdf, 0x92, 0x32, 0x8d, 0x38, 0xc9, 0x8a, 0xb6, 0x29, 0x86, 0x71, - 0x1c, 0x25, 0x99, 0x52, 0x13, 0x35, 0x93, 0x26, 0x4e, 0xd3, 0x96, 0x14, 0x19, 0x8b, 0xb1, 0x2d, - 0x73, 0x40, 0x59, 0xad, 0x67, 0x3a, 0xc3, 0x81, 0x76, 0x21, 0x72, 0xab, 0xe5, 0x62, 0x8b, 0x05, - 0x95, 0xf0, 0xd6, 0x63, 0xc6, 0xbd, 0xf4, 0xd0, 0xab, 0x4e, 0x9d, 0x9e, 0x7a, 0x69, 0xff, 0x41, - 0x7b, 0xcb, 0x31, 0xc7, 0xf4, 0xa2, 0x69, 0x94, 0x9f, 0xd0, 0x5b, 0x2f, 0xed, 0x00, 0x8b, 0x5d, - 0x2e, 0x25, 0xd2, 0x72, 0xa7, 0x3e, 0xf4, 0x06, 0x3c, 0x7e, 0xdf, 0x5b, 0xe0, 0xe1, 0xbd, 0x87, - 0xf7, 0x40, 0x78, 0x77, 0xe0, 0x88, 0xe1, 0xf8, 0xb0, 0x6e, 0xb1, 0xd1, 0x96, 0xcd, 0xac, 0x63, - 0xca, 0xb7, 0x82, 0x2f, 0x08, 0x1f, 0x1d, 0x3b, 0x62, 0x8b, 0xf8, 0xce, 0x56, 0xe0, 0x53, 0x2b, - 0xa8, 0xfb, 0x9c, 0x09, 0x86, 0x50, 0x08, 0xa8, 0x47, 0x80, 0xfa, 0xc9, 0xfb, 0xe5, 0xab, 0xf8, - 0x62, 0xe2, 0x53, 0xcd, 0x2f, 0xdf, 0x18, 0xb0, 0x01, 0x53, 0xc3, 0x2d, 0x39, 0xd2, 0xd2, 0xca, - 0x80, 0xb1, 0x81, 0x4b, 0xb7, 0xd4, 0xec, 0x70, 0x7c, 0xb4, 0x65, 0x8f, 0x39, 0x11, 0x0e, 0xf3, - 0xf4, 0xef, 0xeb, 0x17, 0x7f, 0x27, 0xde, 0x64, 0x11, 0xf5, 0x0b, 0x4e, 0x7c, 0x9f, 0x72, 0xfd, - 0xc1, 0xda, 0x69, 0x06, 0x72, 0x7b, 0xcc, 0xa6, 0x3d, 0x9f, 0x5a, 0xe8, 0x3e, 0x18, 0xc4, 0xf3, - 0x98, 0x50, 0xba, 0x03, 0x33, 0x5d, 0x4d, 0x6f, 0x1a, 0xdb, 0x1b, 0xf5, 0xcb, 0x7b, 0xaa, 0x37, - 0xa6, 0xb0, 0x66, 0xe6, 0xeb, 0xb3, 0x8d, 0x14, 0x4e, 0x32, 0xd1, 0x4f, 0xa1, 0x60, 0xd3, 0xc0, - 0xe1, 0xd4, 0xee, 0x73, 0xe6, 0x52, 0x73, 0xa9, 0x9a, 0xde, 0x5c, 0xdb, 0xbe, 0x35, 0x4f, 0x93, - 0xfc, 0x38, 0x66, 0x2e, 0xc5, 0x86, 0x66, 0xc8, 0x09, 0xba, 0x0f, 0x30, 0xa2, 0xa3, 0x43, 0xca, - 0x83, 0xa1, 0xe3, 0x9b, 0xcb, 0x8a, 0xfe, 0xf6, 0x22, 0xba, 0x5c, 0x7b, 0xfd, 0x51, 0x0c, 0xc7, - 0x09, 0x2a, 0x7a, 0x04, 0x05, 0x72, 0x42, 0x1c, 0x97, 0x1c, 0x3a, 0xae, 0x23, 0x26, 0x66, 0x46, - 0xa9, 0x7a, 0xe7, 0xb9, 0xaa, 0x1a, 0x09, 0x02, 0x9e, 0xa1, 0xd7, 0x6c, 0x80, 0xe9, 0x87, 0xd0, - 0x5d, 0x58, 0xed, 0xb6, 0xf7, 0x5a, 0x9d, 0xbd, 0xfb, 0xa5, 0x54, 0x79, 0xfd, 0xd9, 0x69, 0xf5, - 0x55, 0xa9, 0x63, 0x0a, 0xe8, 0x52, 0xcf, 0x76, 0xbc, 0x01, 0xda, 0x84, 0x5c, 0x63, 0x67, 0xa7, - 0xdd, 0xdd, 0x6f, 0xb7, 0x4a, 0xe9, 0x72, 0xf9, 0xd9, 0x69, 0xf5, 0xb5, 0x59, 0x60, 0xc3, 0xb2, - 0xa8, 0x2f, 0xa8, 0x5d, 0xce, 0x7c, 0xf5, 0x87, 0x4a, 0xaa, 0xf6, 0x55, 0x1a, 0x0a, 0xc9, 0x45, - 0xa0, 0xbb, 0x90, 0x6d, 0xec, 0xec, 0x77, 0x0e, 0xda, 0xa5, 0xd4, 0x94, 0x9e, 0x44, 0x34, 0x2c, - 0xe1, 0x9c, 0x50, 0x74, 0x07, 0x56, 0xba, 0x8d, 0x27, 0xbd, 0x76, 0x29, 0x3d, 0x5d, 0x4e, 0x12, - 0xd6, 0x25, 0xe3, 0x40, 0xa1, 0x5a, 0xb8, 0xd1, 0xd9, 0x2b, 0x2d, 0xcd, 0x47, 0xb5, 0x38, 0x71, - 0x3c, 0xbd, 0x94, 0x3f, 0xad, 0x80, 0xd1, 0xa3, 0xfc, 0xc4, 0xb1, 0x5e, 0xb2, 0x8b, 0x7c, 0x08, - 0x19, 0x41, 0x82, 0x63, 0xe5, 0x1a, 0xc6, 0x7c, 0xd7, 0xd8, 0x27, 0xc1, 0xb1, 0xfc, 0xa8, 0xa6, - 0x2b, 0xbc, 0xf4, 0x0c, 0x4e, 0x7d, 0xd7, 0xb1, 0x88, 0xa0, 0xb6, 0xf2, 0x0c, 0x63, 0xfb, 0xad, - 0x79, 0x6c, 0x1c, 0xa3, 0xf4, 0xfa, 0x77, 0x53, 0x38, 0x41, 0x45, 0x9f, 0x40, 0x76, 0xe0, 0xb2, - 0x43, 0xe2, 0x2a, 0x9f, 0x30, 0xb6, 0xdf, 0x98, 0xa7, 0xe4, 0xbe, 0x42, 0x4c, 0x15, 0x68, 0x0a, - 0xfa, 0x1c, 0xd6, 0xa6, 0xaa, 0xfa, 0xbf, 0x62, 0x87, 0x26, 0x2c, 0x56, 0x32, 0x5d, 0xc9, 0xe7, - 0xec, 0x70, 0x37, 0x85, 0x8b, 0x3c, 0x29, 0x40, 0x3f, 0x01, 0x08, 0xb5, 0x2a, 0x3d, 0x86, 0xd2, - 0x73, 0x7b, 0xf1, 0x62, 0x42, 0x1d, 0xf9, 0x41, 0x34, 0x41, 0x1f, 0x41, 0x76, 0xec, 0xdb, 0x44, - 0x50, 0x33, 0xab, 0xb8, 0xd5, 0x79, 0xdc, 0x27, 0x0a, 0xb1, 0xc3, 0xbc, 0x23, 0x67, 0x80, 0x35, - 0x1e, 0xfd, 0x18, 0x72, 0x9c, 0xb9, 0xee, 0x21, 0xb1, 0x8e, 0xcd, 0xfc, 0x0b, 0x72, 0x63, 0x06, - 0x7a, 0x00, 0x39, 0x8f, 0x8a, 0x2f, 0x18, 0x3f, 0x0e, 0xcc, 0xd5, 0xea, 0xf2, 0xa6, 0xb1, 0xfd, - 0xde, 0xdc, 0xb0, 0x0a, 0x31, 0x0d, 0x21, 0x88, 0x35, 0x1c, 0x51, 0x4f, 0x84, 0x8a, 0x9a, 0x4b, - 0x66, 0x1a, 0xc7, 0x0a, 0xe4, 0x52, 0xa8, 0x67, 0xfb, 0xcc, 0xf1, 0x84, 0x99, 0x5b, 0xbc, 0x94, - 0xb6, 0xc6, 0x48, 0xb7, 0xc0, 0x31, 0xa3, 0x99, 0x85, 0xcc, 0x88, 0xd9, 0xb4, 0xb6, 0x05, 0xd7, - 0x2f, 0x1d, 0x3b, 0x2a, 0x43, 0x4e, 0x1b, 0x3c, 0xf4, 0xd7, 0x0c, 0x8e, 0xe7, 0xb5, 0x6b, 0x50, - 0x9c, 0x39, 0xe2, 0x9a, 0x05, 0xc5, 0x99, 0xe3, 0x42, 0x6f, 0xc1, 0xda, 0x88, 0x7c, 0xd9, 0xb7, - 0x98, 0x67, 0x8d, 0x39, 0xa7, 0x9e, 0xd0, 0x3a, 0x8a, 0x23, 0xf2, 0xe5, 0x4e, 0x2c, 0x44, 0xef, - 0xc1, 0x75, 0xc1, 0x04, 0x71, 0xfb, 0x16, 0x1b, 0xf9, 0x2e, 0x0d, 0xa3, 0x63, 0x49, 0x21, 0x4b, - 0xea, 0x87, 0x9d, 0xa9, 0xbc, 0x66, 0x40, 0x3e, 0x3e, 0xcb, 0xda, 0x9f, 0x57, 0x20, 0x17, 0x79, - 0x3a, 0x7a, 0x00, 0x40, 0x62, 0x43, 0x69, 0x43, 0xbc, 0xf3, 0x42, 0x56, 0x95, 0x74, 0xe9, 0xe1, - 0x53, 0x3a, 0x6a, 0x40, 0xde, 0x62, 0x9e, 0x20, 0x8e, 0x47, 0xb9, 0x8e, 0xd4, 0xb9, 0xfe, 0xb9, - 0x13, 0x81, 0xb4, 0x8e, 0x29, 0x0b, 0x35, 0x61, 0x75, 0x40, 0x3d, 0xca, 0x1d, 0x4b, 0x3b, 0xf8, - 0xdd, 0xb9, 0x8e, 0x19, 0x42, 0xf0, 0xd8, 0x13, 0xce, 0x88, 0x6a, 0x2d, 0x11, 0x11, 0x7d, 0x06, - 0x79, 0x4e, 0x03, 0x36, 0xe6, 0x16, 0x0d, 0x74, 0xb8, 0x6f, 0xce, 0x0f, 0x93, 0x10, 0x84, 0xe9, - 0xaf, 0xc7, 0x0e, 0xa7, 0x72, 0x0b, 0x01, 0x9e, 0x52, 0xd1, 0x27, 0xb0, 0xca, 0x69, 0x20, 0x08, - 0x17, 0xcf, 0x8b, 0x58, 0x1c, 0x42, 0xba, 0xcc, 0x75, 0xac, 0x09, 0x8e, 0x18, 0xe8, 0x13, 0xc8, - 0xfb, 0x2e, 0xb1, 0x94, 0x56, 0x73, 0x65, 0x71, 0x8c, 0x75, 0x23, 0x10, 0x9e, 0xe2, 0xd1, 0xc7, - 0x00, 0x2e, 0x1b, 0xf4, 0x6d, 0xee, 0x9c, 0x50, 0xae, 0xa3, 0xac, 0x3c, 0x8f, 0xdd, 0x52, 0x08, - 0x9c, 0x77, 0xd9, 0x20, 0x1c, 0xa2, 0xfb, 0xff, 0x53, 0x90, 0x24, 0x02, 0xe4, 0x0d, 0x28, 0x1c, - 0x31, 0x6e, 0xd1, 0xbe, 0x8e, 0xf5, 0xbc, 0xf2, 0x2d, 0x43, 0xc9, 0xc2, 0x00, 0x45, 0xbf, 0x84, - 0x57, 0x22, 0x6b, 0xf5, 0x39, 0x3d, 0xa2, 0x9c, 0x7a, 0xd2, 0xe4, 0x86, 0xfa, 0xec, 0x5b, 0xcf, - 0x37, 0xb9, 0x46, 0xeb, 0x54, 0x8b, 0xf8, 0xc5, 0x1f, 0x82, 0x66, 0x1e, 0x56, 0x79, 0x78, 0xc0, - 0xb5, 0xdf, 0xa6, 0x65, 0x9c, 0x5d, 0x40, 0xa0, 0x2d, 0x30, 0xe2, 0xcf, 0x3b, 0xb6, 0x72, 0xb8, - 0x7c, 0x73, 0xed, 0xfc, 0x6c, 0x03, 0x22, 0x6c, 0xa7, 0x25, 0x33, 0xb0, 0x1e, 0xdb, 0xa8, 0x0d, - 0xc5, 0x98, 0x20, 0x8b, 0x20, 0x5d, 0x26, 0x54, 0x9f, 0xb7, 0xd2, 0xfd, 0x89, 0x4f, 0x71, 0x81, - 0x27, 0x66, 0xb5, 0x5f, 0x00, 0xba, 0xec, 0x80, 0x08, 0x41, 0xe6, 0xd8, 0xf1, 0xf4, 0x32, 0xb0, - 0x1a, 0xa3, 0x3a, 0xac, 0xfa, 0x64, 0xe2, 0x32, 0x62, 0x6b, 0x3f, 0xbc, 0x51, 0x0f, 0xcb, 0xa3, - 0x7a, 0x54, 0x1e, 0xd5, 0x1b, 0xde, 0x04, 0x47, 0xa0, 0xda, 0x03, 0x78, 0x75, 0x6e, 0x9c, 0xa1, - 0x6d, 0x28, 0xc4, 0x31, 0x32, 0xdd, 0xeb, 0xb5, 0xf3, 0xb3, 0x0d, 0x23, 0x0e, 0xa6, 0x4e, 0x0b, - 0x1b, 0x31, 0xa8, 0x63, 0xd7, 0xfe, 0xba, 0x06, 0xc5, 0x99, 0x48, 0x43, 0x37, 0x60, 0xc5, 0x19, - 0x91, 0x01, 0xd5, 0x6b, 0x0c, 0x27, 0xa8, 0x0d, 0x59, 0x97, 0x1c, 0x52, 0x57, 0xc6, 0x8a, 0x3c, - 0xb8, 0x1f, 0x5c, 0x19, 0xb2, 0xf5, 0x87, 0x0a, 0xdf, 0xf6, 0x04, 0x9f, 0x60, 0x4d, 0x46, 0x26, - 0xac, 0x5a, 0x6c, 0x34, 0x22, 0x9e, 0xbc, 0x24, 0x97, 0x37, 0xf3, 0x38, 0x9a, 0x4a, 0xcb, 0x10, - 0x3e, 0x08, 0xcc, 0x8c, 0x12, 0xab, 0xb1, 0xcc, 0x91, 0x43, 0x16, 0x08, 0x8f, 0x8c, 0xa8, 0xb9, - 0xa6, 0x56, 0x13, 0xcf, 0x51, 0x09, 0x96, 0xa9, 0x77, 0x62, 0xae, 0x28, 0xb8, 0x1c, 0x4a, 0x89, - 0xed, 0x84, 0x81, 0x90, 0xc7, 0x72, 0x28, 0x75, 0x8e, 0x03, 0xca, 0xcd, 0xd5, 0xd0, 0xda, 0x72, - 0x8c, 0x5e, 0x83, 0xec, 0x80, 0xb3, 0xb1, 0x1f, 0x7a, 0x60, 0x1e, 0xeb, 0x99, 0xbc, 0xef, 0x7c, - 0xee, 0x9c, 0x38, 0x2e, 0x1d, 0xd0, 0xc0, 0x7c, 0x4d, 0x1d, 0x44, 0x65, 0x6e, 0x2c, 0xc6, 0x28, - 0x9c, 0x60, 0xa0, 0x3a, 0x64, 0x1c, 0xcf, 0x11, 0xe6, 0xeb, 0x3a, 0x0e, 0x2f, 0x1e, 0x61, 0x93, - 0x31, 0xf7, 0x80, 0xb8, 0x63, 0x8a, 0x15, 0x0e, 0xad, 0xc3, 0xb2, 0x10, 0x13, 0xb3, 0x58, 0x4d, - 0x6f, 0xe6, 0x9a, 0xab, 0xe7, 0x67, 0x1b, 0xcb, 0xfb, 0xfb, 0x4f, 0xb1, 0x94, 0xa1, 0xdb, 0x00, - 0xcc, 0xa7, 0x5e, 0x3f, 0x10, 0xb6, 0xe3, 0x99, 0x48, 0x22, 0x70, 0x5e, 0x4a, 0x7a, 0x52, 0x80, - 0x6e, 0xca, 0xcc, 0x45, 0xec, 0x3e, 0xf3, 0xdc, 0x89, 0xf9, 0x8a, 0xfa, 0x35, 0x27, 0x05, 0x8f, - 0x3d, 0x77, 0x82, 0x36, 0xc0, 0x08, 0x04, 0xf3, 0xfb, 0x81, 0x33, 0xf0, 0x88, 0x6b, 0xde, 0x50, - 0x3b, 0x07, 0x29, 0xea, 0x29, 0x09, 0xfa, 0x11, 0x64, 0x47, 0x6c, 0xec, 0x89, 0xc0, 0xcc, 0xa9, - 0x83, 0x5c, 0x9f, 0xb7, 0xc7, 0x47, 0x12, 0xa1, 0xa3, 0x4e, 0xc3, 0x51, 0x1b, 0xae, 0x2b, 0xcd, - 0x03, 0x4e, 0x2c, 0xda, 0xf7, 0x29, 0x77, 0x98, 0xad, 0xef, 0xe7, 0xf5, 0x4b, 0xbb, 0x6d, 0xe9, - 0x56, 0x00, 0x5f, 0x93, 0x9c, 0xfb, 0x92, 0xd2, 0x55, 0x0c, 0xd4, 0x85, 0x82, 0x3f, 0x76, 0xdd, - 0x3e, 0xf3, 0xc3, 0xdb, 0x28, 0x4c, 0xe0, 0x2f, 0xe0, 0x4e, 0xdd, 0xb1, 0xeb, 0x3e, 0x0e, 0x49, - 0xd8, 0xf0, 0xa7, 0x13, 0xf4, 0x29, 0xac, 0x06, 0xd4, 0xe2, 0x54, 0x04, 0x66, 0x41, 0x6d, 0xe9, - 0xcd, 0x79, 0xca, 0x7a, 0x0a, 0x12, 0xe7, 0x05, 0x1c, 0x71, 0x24, 0xdd, 0x52, 0x69, 0x2d, 0x30, - 0x5f, 0x5d, 0x4c, 0xd7, 0x99, 0x6f, 0x4a, 0xd7, 0x1c, 0x19, 0x2e, 0xd2, 0x27, 0x03, 0xf3, 0xba, - 0x72, 0xa7, 0x70, 0x82, 0x9e, 0x02, 0xd8, 0x5e, 0xd0, 0x0f, 0x41, 0xe6, 0x35, 0xb5, 0xc7, 0xf7, - 0xae, 0xde, 0x63, 0x6b, 0xaf, 0xa7, 0xeb, 0x90, 0xe2, 0xf9, 0xd9, 0x46, 0x3e, 0x9e, 0xe2, 0xbc, - 0xed, 0x05, 0xe1, 0x10, 0x35, 0xc1, 0x18, 0x52, 0xe2, 0x8a, 0xa1, 0x35, 0xa4, 0xd6, 0xb1, 0x59, - 0x5a, 0x5c, 0x96, 0xec, 0x2a, 0x98, 0xd6, 0x90, 0x24, 0xa1, 0x0e, 0xe4, 0x9d, 0x80, 0xb9, 0xea, - 0x88, 0x4c, 0x53, 0xe5, 0xb7, 0x17, 0x58, 0x5d, 0x27, 0xa2, 0xe0, 0x29, 0x1b, 0xdd, 0x82, 0xbc, - 0xef, 0xd8, 0xc1, 0x43, 0x67, 0xe4, 0x08, 0x73, 0xbd, 0x9a, 0xde, 0x5c, 0xc6, 0x53, 0x01, 0xda, - 0x85, 0xd5, 0x60, 0x12, 0x58, 0xc2, 0x0d, 0xcc, 0xb2, 0x32, 0x6e, 0xfd, 0xea, 0xcf, 0xf4, 0x42, - 0x42, 0x98, 0x38, 0x22, 0xba, 0xac, 0x78, 0x2c, 0xe2, 0xeb, 0x5e, 0xa0, 0x4f, 0x6c, 0xdb, 0xbc, - 0xa9, 0x0c, 0x5e, 0x9c, 0x4a, 0x1b, 0xb6, 0x8d, 0xde, 0x86, 0x6b, 0x09, 0x98, 0xcd, 0x99, 0x6f, - 0xde, 0x52, 0xb8, 0x04, 0xbb, 0xc5, 0x99, 0x2f, 0x6b, 0x88, 0xb1, 0x2b, 0xd7, 0x18, 0x98, 0xb7, - 0xd5, 0xca, 0x36, 0xaf, 0x5e, 0xd9, 0x13, 0x45, 0xc0, 0x11, 0xb1, 0xfc, 0x31, 0x18, 0x89, 0x24, - 0x27, 0x13, 0xd0, 0x31, 0x9d, 0xe8, 0xbc, 0x29, 0x87, 0xd2, 0x39, 0x4e, 0x64, 0xcc, 0xab, 0xc4, - 0x9e, 0xc7, 0xe1, 0xe4, 0xde, 0xd2, 0x47, 0xe9, 0xf2, 0x36, 0x18, 0x09, 0x87, 0x46, 0x6f, 0xca, - 0x4b, 0x67, 0xe0, 0x04, 0x82, 0x4f, 0xfa, 0x64, 0x2c, 0x86, 0xe6, 0xcf, 0x14, 0xa1, 0x10, 0x09, - 0x1b, 0x63, 0x31, 0x2c, 0xf7, 0x61, 0xea, 0x11, 0xa8, 0x0a, 0x86, 0xcc, 0x83, 0x01, 0xe5, 0x27, - 0x94, 0xcb, 0x12, 0x52, 0x6e, 0x32, 0x29, 0x92, 0x99, 0x2e, 0xa0, 0x84, 0x5b, 0x43, 0x95, 0xb2, - 0xf3, 0x58, 0xcf, 0x64, 0x0e, 0x8e, 0x82, 0x4f, 0xe7, 0x60, 0x3d, 0x2d, 0xdf, 0x83, 0x42, 0xd2, - 0xf8, 0xff, 0xd5, 0x86, 0x5a, 0x90, 0x0d, 0xcd, 0x23, 0xb3, 0xae, 0xca, 0xd8, 0xfa, 0x8e, 0x53, - 0xd9, 0x1a, 0x41, 0x26, 0x60, 0x47, 0x42, 0xd1, 0x96, 0xb1, 0x1a, 0x4b, 0xd9, 0x90, 0xf0, 0xb0, - 0x5b, 0x5a, 0xc6, 0x6a, 0x5c, 0xfb, 0x4b, 0x1a, 0xf2, 0xb1, 0x9b, 0xa1, 0x0f, 0xe0, 0x7a, 0xa7, - 0xf7, 0xf8, 0x61, 0x63, 0xbf, 0xf3, 0x78, 0xaf, 0xdf, 0x6a, 0x7f, 0xd6, 0x78, 0xf2, 0x70, 0xbf, - 0x94, 0x2a, 0xdf, 0x7e, 0x76, 0x5a, 0x5d, 0x9f, 0xde, 0x68, 0x11, 0xbc, 0x45, 0x8f, 0xc8, 0xd8, - 0x15, 0xb3, 0xac, 0x2e, 0x7e, 0xbc, 0xd3, 0xee, 0xf5, 0x4a, 0xe9, 0x45, 0xac, 0x2e, 0x67, 0x16, - 0x0d, 0x02, 0xb4, 0x0d, 0xa5, 0x29, 0x6b, 0xf7, 0x69, 0xb7, 0x8d, 0x0f, 0x4a, 0x4b, 0xe5, 0x5b, - 0xcf, 0x4e, 0xab, 0xe6, 0x65, 0xd2, 0xee, 0xc4, 0xa7, 0xfc, 0x40, 0x37, 0xa3, 0xff, 0x4c, 0x43, - 0x21, 0xd9, 0x01, 0xa0, 0x9d, 0xb0, 0xee, 0x57, 0x06, 0x58, 0xdb, 0xde, 0xba, 0xaa, 0x63, 0x50, - 0x55, 0x84, 0x3b, 0x96, 0x7a, 0x1f, 0x31, 0x9b, 0x62, 0x45, 0x46, 0x1f, 0xc0, 0x8a, 0xcf, 0xb8, - 0x88, 0xee, 0xdb, 0xf9, 0x57, 0x11, 0xe3, 0x51, 0x49, 0x16, 0x82, 0x6b, 0x43, 0x58, 0x9b, 0xd5, - 0x86, 0xee, 0xc0, 0xf2, 0x41, 0xa7, 0x5b, 0x4a, 0x95, 0x6f, 0x3e, 0x3b, 0xad, 0xbe, 0x3e, 0xfb, - 0xe3, 0x81, 0xc3, 0xc5, 0x98, 0xb8, 0x9d, 0x2e, 0x7a, 0x17, 0x56, 0x5a, 0x7b, 0x3d, 0x8c, 0x4b, - 0xe9, 0xf2, 0xc6, 0xb3, 0xd3, 0xea, 0xcd, 0x59, 0x9c, 0xfc, 0x89, 0x8d, 0x3d, 0x1b, 0xb3, 0xc3, - 0xb8, 0x05, 0xff, 0xd7, 0x12, 0x18, 0xba, 0x0c, 0x79, 0xd9, 0xaf, 0x34, 0xc5, 0xb0, 0xa4, 0x8d, - 0xb2, 0xe7, 0xd2, 0x95, 0x95, 0x6d, 0x21, 0x24, 0xe8, 0xc8, 0x78, 0x03, 0x0a, 0x8e, 0x7f, 0xf2, - 0x61, 0x9f, 0x7a, 0xe4, 0xd0, 0xd5, 0xdd, 0x78, 0x0e, 0x1b, 0x52, 0xd6, 0x0e, 0x45, 0xb2, 0xb0, - 0x70, 0x3c, 0x41, 0xb9, 0xa7, 0xfb, 0xec, 0x1c, 0x8e, 0xe7, 0xe8, 0x53, 0xc8, 0x38, 0x3e, 0x19, - 0xe9, 0x72, 0x7c, 0xee, 0x0e, 0x3a, 0xdd, 0xc6, 0x23, 0x1d, 0xb9, 0xcd, 0xdc, 0xf9, 0xd9, 0x46, - 0x46, 0x0a, 0xb0, 0xa2, 0xa1, 0x4a, 0xd4, 0x2b, 0xc9, 0x2f, 0xa9, 0x62, 0x24, 0x87, 0x13, 0x12, - 0x19, 0x7d, 0x8e, 0x37, 0xe0, 0x34, 0x08, 0x54, 0x59, 0x92, 0xc3, 0xd1, 0x14, 0x95, 0x61, 0x55, - 0xd7, 0xd5, 0xaa, 0xc5, 0xca, 0xcb, 0x6e, 0x45, 0x0b, 0x9a, 0x45, 0x30, 0x42, 0x6b, 0xf4, 0x8f, - 0x38, 0x1b, 0xd5, 0xfe, 0x9d, 0x01, 0x63, 0xc7, 0x1d, 0x07, 0x42, 0xd7, 0x6c, 0x2f, 0xcd, 0xf8, - 0x4f, 0xe1, 0x3a, 0x51, 0xaf, 0x3e, 0xc4, 0x93, 0x97, 0xbc, 0x6a, 0x57, 0xf4, 0x01, 0xdc, 0x99, - 0xab, 0x2e, 0x06, 0x87, 0xad, 0x4d, 0x33, 0x2b, 0x75, 0x9a, 0x69, 0x5c, 0x22, 0x17, 0x7e, 0x41, - 0x3d, 0x28, 0x32, 0x6e, 0x0d, 0x69, 0x20, 0xc2, 0xd2, 0x40, 0xbf, 0x92, 0xcc, 0x7d, 0x3f, 0x7b, - 0x9c, 0x04, 0xea, 0x1b, 0x31, 0x5c, 0xed, 0xac, 0x0e, 0xf4, 0x11, 0x64, 0x38, 0x39, 0x8a, 0x5a, - 0xaf, 0xb9, 0x41, 0x82, 0xc9, 0x91, 0x98, 0x51, 0xa1, 0x18, 0xe8, 0x73, 0x00, 0xdb, 0x09, 0x7c, - 0x22, 0xac, 0x21, 0xe5, 0xfa, 0xb0, 0xe7, 0x6e, 0xb1, 0x15, 0xa3, 0x66, 0xb4, 0x24, 0xd8, 0xe8, - 0x01, 0xe4, 0x2d, 0x12, 0xb9, 0x6b, 0x76, 0xf1, 0xd3, 0xd1, 0x4e, 0x43, 0xab, 0x28, 0x49, 0x15, - 0xe7, 0x67, 0x1b, 0xb9, 0x48, 0x82, 0x73, 0x16, 0xd1, 0xee, 0xfb, 0x00, 0x8a, 0x82, 0x04, 0xc7, - 0x7d, 0x3b, 0x4c, 0x67, 0xa1, 0x9b, 0x2c, 0xb8, 0xe1, 0x65, 0x87, 0xae, 0xd3, 0x5e, 0x74, 0x9c, - 0x05, 0x91, 0x90, 0xa1, 0x9f, 0xc3, 0x75, 0xea, 0x59, 0x7c, 0xa2, 0x9c, 0x35, 0x5a, 0x61, 0x6e, - 0xf1, 0x66, 0xdb, 0x31, 0x78, 0x66, 0xb3, 0x25, 0x7a, 0x41, 0x5e, 0xfb, 0x7b, 0x1a, 0x20, 0x2c, - 0xa9, 0x5e, 0xae, 0x03, 0x22, 0xc8, 0xd8, 0x44, 0x10, 0xe5, 0x73, 0x05, 0xac, 0xc6, 0xe8, 0x1e, - 0x80, 0xa0, 0x23, 0x5f, 0xa6, 0x5e, 0x6f, 0xa0, 0xdd, 0xe6, 0x79, 0xe9, 0x20, 0x81, 0x46, 0xdb, - 0x90, 0xd5, 0x0d, 0x72, 0xe6, 0x4a, 0x9e, 0x46, 0xd6, 0xfe, 0x98, 0x06, 0x08, 0xb7, 0xf9, 0x7f, - 0xbd, 0xb7, 0xda, 0xdf, 0x56, 0x00, 0x0e, 0x98, 0x3b, 0x1e, 0xbd, 0xe4, 0x47, 0xd0, 0x1b, 0xb0, - 0xa2, 0x9a, 0xa2, 0xe8, 0x92, 0x57, 0x93, 0x84, 0x25, 0x97, 0x5f, 0xd4, 0x92, 0xa8, 0x0d, 0x86, - 0xcc, 0x03, 0x41, 0xd0, 0x57, 0x17, 0x62, 0x66, 0xb1, 0xe3, 0x85, 0xfb, 0x68, 0x28, 0xb0, 0xba, - 0x05, 0x81, 0xc4, 0x63, 0x74, 0x6f, 0x5a, 0xe1, 0xaf, 0xa8, 0xdb, 0xb0, 0xba, 0x58, 0x85, 0xae, - 0xf3, 0xe3, 0xf2, 0x9e, 0xc2, 0x7a, 0xa8, 0xd5, 0xd1, 0x4f, 0xe7, 0x89, 0x77, 0x1c, 0x1d, 0xab, - 0x73, 0x53, 0xd0, 0x3e, 0xf3, 0x99, 0xcb, 0x06, 0x49, 0x3c, 0x5e, 0xac, 0x09, 0xed, 0x86, 0xe5, - 0xa9, 0x25, 0xab, 0x4e, 0x4e, 0xbc, 0x01, 0xd5, 0x61, 0x3b, 0xff, 0x69, 0x4b, 0x23, 0xb1, 0x04, - 0x86, 0x15, 0x6c, 0x3c, 0x45, 0x4f, 0x2e, 0xfc, 0x37, 0x90, 0x53, 0x55, 0xc4, 0xfb, 0xcf, 0xd9, - 0xb1, 0xac, 0x21, 0xb4, 0xfd, 0x16, 0xff, 0x47, 0xf0, 0xfb, 0x34, 0xa0, 0xcb, 0x20, 0xb4, 0x99, - 0x78, 0xc3, 0x57, 0xc5, 0xce, 0x65, 0x8c, 0x7e, 0xc5, 0xbf, 0x3b, 0x7d, 0xc5, 0x57, 0xa5, 0xc4, - 0x65, 0x60, 0xf8, 0x8e, 0x7f, 0x77, 0xfa, 0x8e, 0xbf, 0x00, 0x97, 0x78, 0xc9, 0x6f, 0xde, 0xf9, - 0xfa, 0xbb, 0x4a, 0xea, 0xdb, 0xef, 0x2a, 0xa9, 0xdf, 0x9c, 0x57, 0xd2, 0x5f, 0x9f, 0x57, 0xd2, - 0xdf, 0x9c, 0x57, 0xd2, 0xff, 0x38, 0xaf, 0xa4, 0x7f, 0xf7, 0x7d, 0x25, 0xf5, 0xcd, 0xf7, 0x95, - 0xd4, 0xb7, 0xdf, 0x57, 0x52, 0x87, 0x59, 0xd5, 0x58, 0xfe, 0xf0, 0x3f, 0x01, 0x00, 0x00, 0xff, - 0xff, 0xd2, 0x36, 0x0b, 0x87, 0xf5, 0x1a, 0x00, 0x00, + 0xf5, 0x27, 0x25, 0x8a, 0x22, 0xdf, 0x92, 0x32, 0x8d, 0x38, 0xc9, 0x8a, 0xb6, 0x29, 0x86, 0x71, + 0x1c, 0x25, 0x99, 0x3f, 0x35, 0xd1, 0x3f, 0x93, 0x26, 0x4e, 0xd3, 0x96, 0x14, 0x19, 0x8b, 0xb1, + 0x2d, 0x73, 0x40, 0x59, 0xad, 0x67, 0x3a, 0xc3, 0x81, 0x76, 0x21, 0x72, 0xa3, 0xe5, 0x62, 0x8b, + 0x05, 0x95, 0xf0, 0xd6, 0x63, 0xc6, 0xbd, 0xf4, 0xd0, 0xab, 0x4e, 0x9d, 0x9e, 0x7a, 0x69, 0x3f, + 0x42, 0x6f, 0x39, 0xe6, 0x98, 0x5e, 0x34, 0x8d, 0xd2, 0x6f, 0xd0, 0x5b, 0x2f, 0xed, 0x00, 0x8b, + 0x5d, 0x2e, 0x25, 0xd2, 0x72, 0xa7, 0x3e, 0xf4, 0x06, 0x3c, 0xfe, 0x7e, 0x6f, 0x81, 0x87, 0xf7, + 0x1e, 0xde, 0x03, 0xe1, 0xdd, 0x81, 0x23, 0x86, 0xe3, 0xc3, 0xba, 0xc5, 0x46, 0x5b, 0x36, 0xb3, + 0x8e, 0x29, 0xdf, 0x0a, 0xbe, 0x24, 0x7c, 0x74, 0xec, 0x88, 0x2d, 0xe2, 0x3b, 0x5b, 0x81, 0x4f, + 0xad, 0xa0, 0xee, 0x73, 0x26, 0x18, 0x42, 0x21, 0xa0, 0x1e, 0x01, 0xea, 0x27, 0xef, 0x97, 0xaf, + 0xe2, 0x8b, 0x89, 0x4f, 0x35, 0xbf, 0x7c, 0x63, 0xc0, 0x06, 0x4c, 0x0d, 0xb7, 0xe4, 0x48, 0x4b, + 0x2b, 0x03, 0xc6, 0x06, 0x2e, 0xdd, 0x52, 0xb3, 0xc3, 0xf1, 0xd1, 0x96, 0x3d, 0xe6, 0x44, 0x38, + 0xcc, 0xd3, 0xbf, 0xaf, 0x5f, 0xfc, 0x9d, 0x78, 0x93, 0x45, 0xd4, 0x2f, 0x39, 0xf1, 0x7d, 0xca, + 0xf5, 0x07, 0x6b, 0xa7, 0x19, 0xc8, 0xed, 0x31, 0x9b, 0xf6, 0x7c, 0x6a, 0xa1, 0xfb, 0x60, 0x10, + 0xcf, 0x63, 0x42, 0xe9, 0x0e, 0xcc, 0x74, 0x35, 0xbd, 0x69, 0x6c, 0x6f, 0xd4, 0x2f, 0xef, 0xa9, + 0xde, 0x98, 0xc2, 0x9a, 0x99, 0x6f, 0xce, 0x36, 0x52, 0x38, 0xc9, 0x44, 0x3f, 0x85, 0x82, 0x4d, + 0x03, 0x87, 0x53, 0xbb, 0xcf, 0x99, 0x4b, 0xcd, 0xa5, 0x6a, 0x7a, 0x73, 0x6d, 0xfb, 0xd6, 0x3c, + 0x4d, 0xf2, 0xe3, 0x98, 0xb9, 0x14, 0x1b, 0x9a, 0x21, 0x27, 0xe8, 0x3e, 0xc0, 0x88, 0x8e, 0x0e, + 0x29, 0x0f, 0x86, 0x8e, 0x6f, 0x2e, 0x2b, 0xfa, 0xdb, 0x8b, 0xe8, 0x72, 0xed, 0xf5, 0x47, 0x31, + 0x1c, 0x27, 0xa8, 0xe8, 0x11, 0x14, 0xc8, 0x09, 0x71, 0x5c, 0x72, 0xe8, 0xb8, 0x8e, 0x98, 0x98, + 0x19, 0xa5, 0xea, 0x9d, 0xe7, 0xaa, 0x6a, 0x24, 0x08, 0x78, 0x86, 0x5e, 0xb3, 0x01, 0xa6, 0x1f, + 0x42, 0x77, 0x61, 0xb5, 0xdb, 0xde, 0x6b, 0x75, 0xf6, 0xee, 0x97, 0x52, 0xe5, 0xf5, 0x67, 0xa7, + 0xd5, 0x57, 0xa5, 0x8e, 0x29, 0xa0, 0x4b, 0x3d, 0xdb, 0xf1, 0x06, 0x68, 0x13, 0x72, 0x8d, 0x9d, + 0x9d, 0x76, 0x77, 0xbf, 0xdd, 0x2a, 0xa5, 0xcb, 0xe5, 0x67, 0xa7, 0xd5, 0xd7, 0x66, 0x81, 0x0d, + 0xcb, 0xa2, 0xbe, 0xa0, 0x76, 0x39, 0xf3, 0xf5, 0xef, 0x2b, 0xa9, 0xda, 0xd7, 0x69, 0x28, 0x24, + 0x17, 0x81, 0xee, 0x42, 0xb6, 0xb1, 0xb3, 0xdf, 0x39, 0x68, 0x97, 0x52, 0x53, 0x7a, 0x12, 0xd1, + 0xb0, 0x84, 0x73, 0x42, 0xd1, 0x1d, 0x58, 0xe9, 0x36, 0x9e, 0xf4, 0xda, 0xa5, 0xf4, 0x74, 0x39, + 0x49, 0x58, 0x97, 0x8c, 0x03, 0x85, 0x6a, 0xe1, 0x46, 0x67, 0xaf, 0xb4, 0x34, 0x1f, 0xd5, 0xe2, + 0xc4, 0xf1, 0xf4, 0x52, 0xfe, 0xb8, 0x02, 0x46, 0x8f, 0xf2, 0x13, 0xc7, 0x7a, 0xc9, 0x2e, 0xf2, + 0x21, 0x64, 0x04, 0x09, 0x8e, 0x95, 0x6b, 0x18, 0xf3, 0x5d, 0x63, 0x9f, 0x04, 0xc7, 0xf2, 0xa3, + 0x9a, 0xae, 0xf0, 0xd2, 0x33, 0x38, 0xf5, 0x5d, 0xc7, 0x22, 0x82, 0xda, 0xca, 0x33, 0x8c, 0xed, + 0xb7, 0xe6, 0xb1, 0x71, 0x8c, 0xd2, 0xeb, 0xdf, 0x4d, 0xe1, 0x04, 0x15, 0x7d, 0x02, 0xd9, 0x81, + 0xcb, 0x0e, 0x89, 0xab, 0x7c, 0xc2, 0xd8, 0x7e, 0x63, 0x9e, 0x92, 0xfb, 0x0a, 0x31, 0x55, 0xa0, + 0x29, 0xe8, 0x73, 0x58, 0x9b, 0xaa, 0xea, 0x7f, 0xc1, 0x0e, 0x4d, 0x58, 0xac, 0x64, 0xba, 0x92, + 0xcf, 0xd9, 0xe1, 0x6e, 0x0a, 0x17, 0x79, 0x52, 0x80, 0x7e, 0x02, 0x10, 0x6a, 0x55, 0x7a, 0x0c, + 0xa5, 0xe7, 0xf6, 0xe2, 0xc5, 0x84, 0x3a, 0xf2, 0x83, 0x68, 0x82, 0x3e, 0x82, 0xec, 0xd8, 0xb7, + 0x89, 0xa0, 0x66, 0x56, 0x71, 0xab, 0xf3, 0xb8, 0x4f, 0x14, 0x62, 0x87, 0x79, 0x47, 0xce, 0x00, + 0x6b, 0x3c, 0xfa, 0x31, 0xe4, 0x38, 0x73, 0xdd, 0x43, 0x62, 0x1d, 0x9b, 0xf9, 0x17, 0xe4, 0xc6, + 0x0c, 0xf4, 0x00, 0x72, 0x1e, 0x15, 0x5f, 0x32, 0x7e, 0x1c, 0x98, 0xab, 0xd5, 0xe5, 0x4d, 0x63, + 0xfb, 0xbd, 0xb9, 0x61, 0x15, 0x62, 0x1a, 0x42, 0x10, 0x6b, 0x38, 0xa2, 0x9e, 0x08, 0x15, 0x35, + 0x97, 0xcc, 0x34, 0x8e, 0x15, 0xc8, 0xa5, 0x50, 0xcf, 0xf6, 0x99, 0xe3, 0x09, 0x33, 0xb7, 0x78, + 0x29, 0x6d, 0x8d, 0x91, 0x6e, 0x81, 0x63, 0x46, 0x33, 0x0b, 0x99, 0x11, 0xb3, 0x69, 0x6d, 0x0b, + 0xae, 0x5f, 0x3a, 0x76, 0x54, 0x86, 0x9c, 0x36, 0x78, 0xe8, 0xaf, 0x19, 0x1c, 0xcf, 0x6b, 0xd7, + 0xa0, 0x38, 0x73, 0xc4, 0x35, 0x0b, 0x8a, 0x33, 0xc7, 0x85, 0xde, 0x82, 0xb5, 0x11, 0xf9, 0xaa, + 0x6f, 0x31, 0xcf, 0x1a, 0x73, 0x4e, 0x3d, 0xa1, 0x75, 0x14, 0x47, 0xe4, 0xab, 0x9d, 0x58, 0x88, + 0xde, 0x83, 0xeb, 0x82, 0x09, 0xe2, 0xf6, 0x2d, 0x36, 0xf2, 0x5d, 0x1a, 0x46, 0xc7, 0x92, 0x42, + 0x96, 0xd4, 0x0f, 0x3b, 0x53, 0x79, 0xcd, 0x80, 0x7c, 0x7c, 0x96, 0xb5, 0x3f, 0xad, 0x40, 0x2e, + 0xf2, 0x74, 0xf4, 0x00, 0x80, 0xc4, 0x86, 0xd2, 0x86, 0x78, 0xe7, 0x85, 0xac, 0x2a, 0xe9, 0xd2, + 0xc3, 0xa7, 0x74, 0xd4, 0x80, 0xbc, 0xc5, 0x3c, 0x41, 0x1c, 0x8f, 0x72, 0x1d, 0xa9, 0x73, 0xfd, + 0x73, 0x27, 0x02, 0x69, 0x1d, 0x53, 0x16, 0x6a, 0xc2, 0xea, 0x80, 0x7a, 0x94, 0x3b, 0x96, 0x76, + 0xf0, 0xbb, 0x73, 0x1d, 0x33, 0x84, 0xe0, 0xb1, 0x27, 0x9c, 0x11, 0xd5, 0x5a, 0x22, 0x22, 0xfa, + 0x0c, 0xf2, 0x9c, 0x06, 0x6c, 0xcc, 0x2d, 0x1a, 0xe8, 0x70, 0xdf, 0x9c, 0x1f, 0x26, 0x21, 0x08, + 0xd3, 0x5f, 0x8d, 0x1d, 0x4e, 0xe5, 0x16, 0x02, 0x3c, 0xa5, 0xa2, 0x4f, 0x60, 0x95, 0xd3, 0x40, + 0x10, 0x2e, 0x9e, 0x17, 0xb1, 0x38, 0x84, 0x74, 0x99, 0xeb, 0x58, 0x13, 0x1c, 0x31, 0xd0, 0x27, + 0x90, 0xf7, 0x5d, 0x62, 0x29, 0xad, 0xe6, 0xca, 0xe2, 0x18, 0xeb, 0x46, 0x20, 0x3c, 0xc5, 0xa3, + 0x8f, 0x01, 0x5c, 0x36, 0xe8, 0xdb, 0xdc, 0x39, 0xa1, 0x5c, 0x47, 0x59, 0x79, 0x1e, 0xbb, 0xa5, + 0x10, 0x38, 0xef, 0xb2, 0x41, 0x38, 0x44, 0xf7, 0xff, 0xab, 0x20, 0x49, 0x04, 0xc8, 0x1b, 0x50, + 0x38, 0x62, 0xdc, 0xa2, 0x7d, 0x1d, 0xeb, 0x79, 0xe5, 0x5b, 0x86, 0x92, 0x85, 0x01, 0x8a, 0x7e, + 0x09, 0xaf, 0x44, 0xd6, 0xea, 0x73, 0x7a, 0x44, 0x39, 0xf5, 0xa4, 0xc9, 0x0d, 0xf5, 0xd9, 0xb7, + 0x9e, 0x6f, 0x72, 0x8d, 0xd6, 0xa9, 0x16, 0xf1, 0x8b, 0x3f, 0x04, 0xcd, 0x3c, 0xac, 0xf2, 0xf0, + 0x80, 0x6b, 0xbf, 0x49, 0xcb, 0x38, 0xbb, 0x80, 0x40, 0x5b, 0x60, 0xc4, 0x9f, 0x77, 0x6c, 0xe5, + 0x70, 0xf9, 0xe6, 0xda, 0xf9, 0xd9, 0x06, 0x44, 0xd8, 0x4e, 0x4b, 0x66, 0x60, 0x3d, 0xb6, 0x51, + 0x1b, 0x8a, 0x31, 0x41, 0x16, 0x41, 0xba, 0x4c, 0xa8, 0x3e, 0x6f, 0xa5, 0xfb, 0x13, 0x9f, 0xe2, + 0x02, 0x4f, 0xcc, 0x6a, 0xbf, 0x00, 0x74, 0xd9, 0x01, 0x11, 0x82, 0xcc, 0xb1, 0xe3, 0xe9, 0x65, + 0x60, 0x35, 0x46, 0x75, 0x58, 0xf5, 0xc9, 0xc4, 0x65, 0xc4, 0xd6, 0x7e, 0x78, 0xa3, 0x1e, 0x96, + 0x47, 0xf5, 0xa8, 0x3c, 0xaa, 0x37, 0xbc, 0x09, 0x8e, 0x40, 0xb5, 0x07, 0xf0, 0xea, 0xdc, 0x38, + 0x43, 0xdb, 0x50, 0x88, 0x63, 0x64, 0xba, 0xd7, 0x6b, 0xe7, 0x67, 0x1b, 0x46, 0x1c, 0x4c, 0x9d, + 0x16, 0x36, 0x62, 0x50, 0xc7, 0xae, 0xfd, 0x7d, 0x0d, 0x8a, 0x33, 0x91, 0x86, 0x6e, 0xc0, 0x8a, + 0x33, 0x22, 0x03, 0xaa, 0xd7, 0x18, 0x4e, 0x50, 0x1b, 0xb2, 0x2e, 0x39, 0xa4, 0xae, 0x8c, 0x15, + 0x79, 0x70, 0xff, 0x77, 0x65, 0xc8, 0xd6, 0x1f, 0x2a, 0x7c, 0xdb, 0x13, 0x7c, 0x82, 0x35, 0x19, + 0x99, 0xb0, 0x6a, 0xb1, 0xd1, 0x88, 0x78, 0xf2, 0x92, 0x5c, 0xde, 0xcc, 0xe3, 0x68, 0x2a, 0x2d, + 0x43, 0xf8, 0x20, 0x30, 0x33, 0x4a, 0xac, 0xc6, 0x32, 0x47, 0x0e, 0x59, 0x20, 0x3c, 0x32, 0xa2, + 0xe6, 0x9a, 0x5a, 0x4d, 0x3c, 0x47, 0x25, 0x58, 0xa6, 0xde, 0x89, 0xb9, 0xa2, 0xe0, 0x72, 0x28, + 0x25, 0xb6, 0x13, 0x06, 0x42, 0x1e, 0xcb, 0xa1, 0xd4, 0x39, 0x0e, 0x28, 0x37, 0x57, 0x43, 0x6b, + 0xcb, 0x31, 0x7a, 0x0d, 0xb2, 0x03, 0xce, 0xc6, 0x7e, 0xe8, 0x81, 0x79, 0xac, 0x67, 0xf2, 0xbe, + 0xf3, 0xb9, 0x73, 0xe2, 0xb8, 0x74, 0x40, 0x03, 0xf3, 0x35, 0x75, 0x10, 0x95, 0xb9, 0xb1, 0x18, + 0xa3, 0x70, 0x82, 0x81, 0xea, 0x90, 0x71, 0x3c, 0x47, 0x98, 0xaf, 0xeb, 0x38, 0xbc, 0x78, 0x84, + 0x4d, 0xc6, 0xdc, 0x03, 0xe2, 0x8e, 0x29, 0x56, 0x38, 0xb4, 0x0e, 0xcb, 0x42, 0x4c, 0xcc, 0x62, + 0x35, 0xbd, 0x99, 0x6b, 0xae, 0x9e, 0x9f, 0x6d, 0x2c, 0xef, 0xef, 0x3f, 0xc5, 0x52, 0x86, 0x6e, + 0x03, 0x30, 0x9f, 0x7a, 0xfd, 0x40, 0xd8, 0x8e, 0x67, 0x22, 0x89, 0xc0, 0x79, 0x29, 0xe9, 0x49, + 0x01, 0xba, 0x29, 0x33, 0x17, 0xb1, 0xfb, 0xcc, 0x73, 0x27, 0xe6, 0x2b, 0xea, 0xd7, 0x9c, 0x14, + 0x3c, 0xf6, 0xdc, 0x09, 0xda, 0x00, 0x23, 0x10, 0xcc, 0xef, 0x07, 0xce, 0xc0, 0x23, 0xae, 0x79, + 0x43, 0xed, 0x1c, 0xa4, 0xa8, 0xa7, 0x24, 0xe8, 0x47, 0x90, 0x1d, 0xb1, 0xb1, 0x27, 0x02, 0x33, + 0xa7, 0x0e, 0x72, 0x7d, 0xde, 0x1e, 0x1f, 0x49, 0x84, 0x8e, 0x3a, 0x0d, 0x47, 0x6d, 0xb8, 0xae, + 0x34, 0x0f, 0x38, 0xb1, 0x68, 0xdf, 0xa7, 0xdc, 0x61, 0xb6, 0xbe, 0x9f, 0xd7, 0x2f, 0xed, 0xb6, + 0xa5, 0x5b, 0x01, 0x7c, 0x4d, 0x72, 0xee, 0x4b, 0x4a, 0x57, 0x31, 0x50, 0x17, 0x0a, 0xfe, 0xd8, + 0x75, 0xfb, 0xcc, 0x0f, 0x6f, 0xa3, 0x30, 0x81, 0xbf, 0x80, 0x3b, 0x75, 0xc7, 0xae, 0xfb, 0x38, + 0x24, 0x61, 0xc3, 0x9f, 0x4e, 0xd0, 0xa7, 0xb0, 0x1a, 0x50, 0x8b, 0x53, 0x11, 0x98, 0x05, 0xb5, + 0xa5, 0x37, 0xe7, 0x29, 0xeb, 0x29, 0x48, 0x9c, 0x17, 0x70, 0xc4, 0x91, 0x74, 0x4b, 0xa5, 0xb5, + 0xc0, 0x7c, 0x75, 0x31, 0x5d, 0x67, 0xbe, 0x29, 0x5d, 0x73, 0x64, 0xb8, 0x48, 0x9f, 0x0c, 0xcc, + 0xeb, 0xca, 0x9d, 0xc2, 0x09, 0x7a, 0x0a, 0x60, 0x7b, 0x41, 0x3f, 0x04, 0x99, 0xd7, 0xd4, 0x1e, + 0xdf, 0xbb, 0x7a, 0x8f, 0xad, 0xbd, 0x9e, 0xae, 0x43, 0x8a, 0xe7, 0x67, 0x1b, 0xf9, 0x78, 0x8a, + 0xf3, 0xb6, 0x17, 0x84, 0x43, 0xd4, 0x04, 0x63, 0x48, 0x89, 0x2b, 0x86, 0xd6, 0x90, 0x5a, 0xc7, + 0x66, 0x69, 0x71, 0x59, 0xb2, 0xab, 0x60, 0x5a, 0x43, 0x92, 0x84, 0x3a, 0x90, 0x77, 0x02, 0xe6, + 0xaa, 0x23, 0x32, 0x4d, 0x95, 0xdf, 0x5e, 0x60, 0x75, 0x9d, 0x88, 0x82, 0xa7, 0x6c, 0x74, 0x0b, + 0xf2, 0xbe, 0x63, 0x07, 0x0f, 0x9d, 0x91, 0x23, 0xcc, 0xf5, 0x6a, 0x7a, 0x73, 0x19, 0x4f, 0x05, + 0x68, 0x17, 0x56, 0x83, 0x49, 0x60, 0x09, 0x37, 0x30, 0xcb, 0xca, 0xb8, 0xf5, 0xab, 0x3f, 0xd3, + 0x0b, 0x09, 0x61, 0xe2, 0x88, 0xe8, 0xb2, 0xe2, 0xb1, 0x88, 0xaf, 0x7b, 0x81, 0x3e, 0xb1, 0x6d, + 0xf3, 0xa6, 0x32, 0x78, 0x71, 0x2a, 0x6d, 0xd8, 0x36, 0x7a, 0x1b, 0xae, 0x25, 0x60, 0x36, 0x67, + 0xbe, 0x79, 0x4b, 0xe1, 0x12, 0xec, 0x16, 0x67, 0xbe, 0xac, 0x21, 0xc6, 0xae, 0x5c, 0x63, 0x60, + 0xde, 0x56, 0x2b, 0xdb, 0xbc, 0x7a, 0x65, 0x4f, 0x14, 0x01, 0x47, 0x44, 0x54, 0x83, 0x22, 0x63, + 0xa3, 0x7e, 0x60, 0x31, 0x4e, 0xfb, 0xc4, 0xfe, 0xc2, 0xac, 0xa8, 0xfd, 0x1b, 0x8c, 0x8d, 0x7a, + 0x52, 0xd6, 0xb0, 0xbf, 0x28, 0x7f, 0x0c, 0x46, 0x22, 0x11, 0xca, 0x24, 0x75, 0x4c, 0x27, 0x3a, + 0xb7, 0xca, 0xa1, 0x74, 0xa0, 0x13, 0x99, 0x17, 0x54, 0xf2, 0xcf, 0xe3, 0x70, 0x72, 0x6f, 0xe9, + 0xa3, 0x74, 0x79, 0x1b, 0x8c, 0x84, 0xd3, 0xa3, 0x37, 0xe5, 0xc5, 0x34, 0x70, 0x02, 0xc1, 0x27, + 0x7d, 0x32, 0x16, 0x43, 0xf3, 0x67, 0x8a, 0x50, 0x88, 0x84, 0x8d, 0xb1, 0x18, 0x96, 0xfb, 0x30, + 0xf5, 0x1a, 0x54, 0x05, 0x43, 0xe6, 0xca, 0x80, 0xf2, 0x13, 0xca, 0x65, 0x99, 0x29, 0x0d, 0x91, + 0x14, 0xc9, 0x6c, 0x18, 0x50, 0xc2, 0xad, 0xa1, 0x4a, 0xeb, 0x79, 0xac, 0x67, 0x32, 0x4f, 0x47, + 0x01, 0xaa, 0xf3, 0xb4, 0x9e, 0x96, 0xef, 0x41, 0x21, 0x79, 0x40, 0xff, 0xd1, 0x86, 0x5a, 0x90, + 0x0d, 0x4d, 0x28, 0x33, 0xb3, 0xca, 0xea, 0xfa, 0x1e, 0x54, 0x19, 0x1d, 0x41, 0x26, 0x60, 0x47, + 0x42, 0xd1, 0x96, 0xb1, 0x1a, 0x4b, 0xd9, 0x90, 0xf0, 0xb0, 0xa3, 0x5a, 0xc6, 0x6a, 0x5c, 0xfb, + 0x73, 0x1a, 0xf2, 0xb1, 0x2b, 0xa2, 0x0f, 0xe0, 0x7a, 0xa7, 0xf7, 0xf8, 0x61, 0x63, 0xbf, 0xf3, + 0x78, 0xaf, 0xdf, 0x6a, 0x7f, 0xd6, 0x78, 0xf2, 0x70, 0xbf, 0x94, 0x2a, 0xdf, 0x7e, 0x76, 0x5a, + 0x5d, 0x9f, 0xde, 0x7a, 0x11, 0xbc, 0x45, 0x8f, 0xc8, 0xd8, 0x15, 0xb3, 0xac, 0x2e, 0x7e, 0xbc, + 0xd3, 0xee, 0xf5, 0x4a, 0xe9, 0x45, 0xac, 0x2e, 0x67, 0x16, 0x0d, 0x02, 0xb4, 0x0d, 0xa5, 0x29, + 0x6b, 0xf7, 0x69, 0xb7, 0x8d, 0x0f, 0x4a, 0x4b, 0xe5, 0x5b, 0xcf, 0x4e, 0xab, 0xe6, 0x65, 0xd2, + 0xee, 0xc4, 0xa7, 0xfc, 0x40, 0x37, 0xac, 0xff, 0x48, 0x43, 0x21, 0xd9, 0x25, 0xa0, 0x9d, 0xb0, + 0x37, 0x50, 0x06, 0x58, 0xdb, 0xde, 0xba, 0xaa, 0xab, 0x50, 0x95, 0x86, 0x3b, 0x96, 0x7a, 0x1f, + 0x31, 0x9b, 0x62, 0x45, 0x46, 0x1f, 0xc0, 0x8a, 0xcf, 0xb8, 0x88, 0xee, 0xe4, 0xf9, 0xd7, 0x15, + 0xe3, 0x51, 0xd9, 0x16, 0x82, 0x6b, 0x43, 0x58, 0x9b, 0xd5, 0x86, 0xee, 0xc0, 0xf2, 0x41, 0xa7, + 0x5b, 0x4a, 0x95, 0x6f, 0x3e, 0x3b, 0xad, 0xbe, 0x3e, 0xfb, 0xe3, 0x81, 0xc3, 0xc5, 0x98, 0xb8, + 0x9d, 0x2e, 0x7a, 0x17, 0x56, 0x5a, 0x7b, 0x3d, 0x8c, 0x4b, 0xe9, 0xf2, 0xc6, 0xb3, 0xd3, 0xea, + 0xcd, 0x59, 0x9c, 0xfc, 0x89, 0x8d, 0x3d, 0x1b, 0xb3, 0xc3, 0xb8, 0x4d, 0xff, 0xe7, 0x12, 0x18, + 0xba, 0x54, 0x79, 0xd9, 0x2f, 0x39, 0xc5, 0xb0, 0xec, 0x8d, 0x32, 0xec, 0xd2, 0x95, 0xd5, 0x6f, + 0x21, 0x24, 0xe8, 0xc8, 0x78, 0x03, 0x0a, 0x8e, 0x7f, 0xf2, 0x61, 0x9f, 0x7a, 0xe4, 0xd0, 0xd5, + 0x1d, 0x7b, 0x0e, 0x1b, 0x52, 0xd6, 0x0e, 0x45, 0xb2, 0xf8, 0x70, 0x3c, 0x41, 0xb9, 0xa7, 0x7b, + 0xf1, 0x1c, 0x8e, 0xe7, 0xe8, 0x53, 0xc8, 0x38, 0x3e, 0x19, 0xe9, 0x92, 0x7d, 0xee, 0x0e, 0x3a, + 0xdd, 0xc6, 0x23, 0x1d, 0xb9, 0xcd, 0xdc, 0xf9, 0xd9, 0x46, 0x46, 0x0a, 0xb0, 0xa2, 0xa1, 0x4a, + 0xd4, 0x4f, 0xc9, 0x2f, 0xa9, 0x82, 0x25, 0x87, 0x13, 0x12, 0x19, 0x7d, 0x8e, 0x37, 0xe0, 0x34, + 0x08, 0x54, 0xe9, 0x92, 0xc3, 0xd1, 0x14, 0x95, 0x61, 0x55, 0xd7, 0xde, 0xaa, 0x0d, 0xcb, 0xcb, + 0x8e, 0x46, 0x0b, 0x9a, 0x45, 0x30, 0x42, 0x6b, 0xf4, 0x8f, 0x38, 0x1b, 0xd5, 0xfe, 0x95, 0x01, + 0x63, 0xc7, 0x1d, 0x07, 0x42, 0xd7, 0x75, 0x2f, 0xcd, 0xf8, 0x4f, 0xe1, 0x3a, 0x51, 0x2f, 0x43, + 0xc4, 0x93, 0x85, 0x80, 0x6a, 0x69, 0xf4, 0x01, 0xdc, 0x99, 0xab, 0x2e, 0x06, 0x87, 0xed, 0x4f, + 0x33, 0x2b, 0x75, 0x9a, 0x69, 0x5c, 0x22, 0x17, 0x7e, 0x41, 0x3d, 0x28, 0x32, 0x6e, 0x0d, 0x69, + 0x20, 0xc2, 0xf2, 0x41, 0xbf, 0xa4, 0xcc, 0x7d, 0x63, 0x7b, 0x9c, 0x04, 0xea, 0x5b, 0x33, 0x5c, + 0xed, 0xac, 0x0e, 0xf4, 0x11, 0x64, 0x38, 0x39, 0x8a, 0xda, 0xb3, 0xb9, 0x41, 0x82, 0xc9, 0x91, + 0x98, 0x51, 0xa1, 0x18, 0xe8, 0x73, 0x00, 0xdb, 0x09, 0x7c, 0x22, 0xac, 0x21, 0xe5, 0xfa, 0xb0, + 0xe7, 0x6e, 0xb1, 0x15, 0xa3, 0x66, 0xb4, 0x24, 0xd8, 0xe8, 0x01, 0xe4, 0x2d, 0x12, 0xb9, 0x6b, + 0x76, 0xf1, 0xf3, 0xd2, 0x4e, 0x43, 0xab, 0x28, 0x49, 0x15, 0xe7, 0x67, 0x1b, 0xb9, 0x48, 0x82, + 0x73, 0x16, 0xd1, 0xee, 0xfb, 0x00, 0x8a, 0x82, 0x04, 0xc7, 0x7d, 0x3b, 0x4c, 0x67, 0xa1, 0x9b, + 0x2c, 0xa8, 0x02, 0x64, 0x17, 0xaf, 0xd3, 0x5e, 0x74, 0x9c, 0x05, 0x91, 0x90, 0xa1, 0x9f, 0xc3, + 0x75, 0xea, 0x59, 0x7c, 0xa2, 0x9c, 0x35, 0x5a, 0x61, 0x6e, 0xf1, 0x66, 0xdb, 0x31, 0x78, 0x66, + 0xb3, 0x25, 0x7a, 0x41, 0x5e, 0xfb, 0x6b, 0x1a, 0x20, 0x2c, 0xbb, 0x5e, 0xae, 0x03, 0x22, 0xc8, + 0xd8, 0x44, 0x10, 0xe5, 0x73, 0x05, 0xac, 0xc6, 0xe8, 0x1e, 0x80, 0xa0, 0x23, 0x5f, 0xa6, 0x5e, + 0x6f, 0xa0, 0xdd, 0xe6, 0x79, 0xe9, 0x20, 0x81, 0x46, 0xdb, 0x90, 0xd5, 0x4d, 0x74, 0xe6, 0x4a, + 0x9e, 0x46, 0xd6, 0xfe, 0x90, 0x06, 0x08, 0xb7, 0xf9, 0x3f, 0xbd, 0xb7, 0xda, 0x5f, 0x56, 0x00, + 0x0e, 0x98, 0x3b, 0x1e, 0xbd, 0xe4, 0x87, 0xd2, 0x1b, 0xb0, 0xa2, 0x1a, 0xa7, 0xe8, 0x92, 0x57, + 0x93, 0x84, 0x25, 0x97, 0x5f, 0xd4, 0x92, 0xa8, 0x0d, 0x86, 0xcc, 0x03, 0x41, 0xd0, 0x57, 0x17, + 0x62, 0x66, 0xb1, 0xe3, 0x85, 0xfb, 0x68, 0x28, 0xb0, 0xba, 0x05, 0x81, 0xc4, 0x63, 0x74, 0x6f, + 0xda, 0x05, 0xac, 0xa8, 0xdb, 0xb0, 0xba, 0x58, 0x85, 0xee, 0x05, 0xe2, 0x16, 0x80, 0xc2, 0x7a, + 0xa8, 0xd5, 0xd1, 0xcf, 0xeb, 0x89, 0xb7, 0x1e, 0x1d, 0xab, 0x73, 0x53, 0xd0, 0x3e, 0xf3, 0x99, + 0xcb, 0x06, 0x49, 0x3c, 0x5e, 0xac, 0x09, 0xed, 0x86, 0x25, 0xac, 0x25, 0x2b, 0x53, 0x4e, 0xbc, + 0x01, 0xd5, 0x61, 0x3b, 0xff, 0xf9, 0x4b, 0x23, 0xb1, 0x04, 0x86, 0x55, 0x6e, 0x3c, 0x45, 0x4f, + 0x2e, 0xfc, 0x7f, 0x90, 0x53, 0x55, 0xc4, 0xfb, 0xcf, 0xd9, 0xb1, 0xac, 0x21, 0xb4, 0xfd, 0x16, + 0xff, 0x8f, 0xf0, 0xbb, 0x34, 0xa0, 0xcb, 0x20, 0xb4, 0x99, 0x78, 0xe7, 0x57, 0xc5, 0xce, 0x65, + 0x8c, 0x7e, 0xe9, 0xbf, 0x3b, 0x7d, 0xe9, 0x57, 0xa5, 0xc4, 0x65, 0x60, 0xf8, 0xd6, 0x7f, 0x77, + 0xfa, 0xd6, 0xbf, 0x00, 0x97, 0x78, 0xed, 0x6f, 0xde, 0xf9, 0xe6, 0xfb, 0x4a, 0xea, 0xbb, 0xef, + 0x2b, 0xa9, 0x5f, 0x9f, 0x57, 0xd2, 0xdf, 0x9c, 0x57, 0xd2, 0xdf, 0x9e, 0x57, 0xd2, 0x7f, 0x3b, + 0xaf, 0xa4, 0x7f, 0xfb, 0x43, 0x25, 0xf5, 0xed, 0x0f, 0x95, 0xd4, 0x77, 0x3f, 0x54, 0x52, 0x87, + 0x59, 0xd5, 0x7c, 0xfe, 0xff, 0xbf, 0x03, 0x00, 0x00, 0xff, 0xff, 0x51, 0x6a, 0xd3, 0x1b, 0x19, + 0x1b, 0x00, 0x00, } func (m *NodeSpec) Copy() *NodeSpec { @@ -2836,6 +2839,13 @@ func (m *ContainerSpec) MarshalToSizedBuffer(dAtA []byte) (int, error) { _ = i var l int _ = l + if m.OomScoreAdj != 0 { + i = encodeVarintSpecs(dAtA, i, uint64(m.OomScoreAdj)) + i-- + dAtA[i] = 0x1 + i-- + dAtA[i] = 0xf0 + } if len(m.Ulimits) > 0 { for iNdEx := len(m.Ulimits) - 1; iNdEx >= 0; iNdEx-- { { @@ -4211,6 +4221,9 @@ func (m *ContainerSpec) Size() (n int) { n += 2 + l + sovSpecs(uint64(l)) } } + if m.OomScoreAdj != 0 { + n += 2 + sovSpecs(uint64(m.OomScoreAdj)) + } return n } @@ -4724,6 +4737,7 @@ func (this *ContainerSpec) String() string { `CapabilityAdd:` + fmt.Sprintf("%v", this.CapabilityAdd) + `,`, `CapabilityDrop:` + fmt.Sprintf("%v", this.CapabilityDrop) + `,`, `Ulimits:` + repeatedStringForUlimits + `,`, + `OomScoreAdj:` + fmt.Sprintf("%v", this.OomScoreAdj) + `,`, `}`, }, "") return s @@ -7476,6 +7490,25 @@ func (m *ContainerSpec) Unmarshal(dAtA []byte) error { return err } iNdEx = postIndex + case 30: + if wireType != 0 { + return fmt.Errorf("proto: wrong wireType = %d for field OomScoreAdj", wireType) + } + m.OomScoreAdj = 0 + for shift := uint(0); ; shift += 7 { + if shift >= 64 { + return ErrIntOverflowSpecs + } + if iNdEx >= l { + return io.ErrUnexpectedEOF + } + b := dAtA[iNdEx] + iNdEx++ + m.OomScoreAdj |= int64(b&0x7F) << shift + if b < 0x80 { + break + } + } default: iNdEx = preIndex skippy, err := skipSpecs(dAtA[iNdEx:]) diff --git a/api/specs.proto b/api/specs.proto index a097b2be3c..a59d566ddb 100644 --- a/api/specs.proto +++ b/api/specs.proto @@ -137,6 +137,8 @@ message TaskSpec { // Placement specifies node selection constraints Placement placement = 5; + + // LogDriver specifies the log driver to use for the task. Any runtime will // direct logs into the specified driver for the duration of the task. Driver log_driver = 6; @@ -370,6 +372,8 @@ message ContainerSpec { // Ulimits defines the list of ulimits to set in the container. This option // is equivalent to passing --ulimit to docker run. repeated Ulimit ulimits = 29; + + int64 oom_score_adj = 30; } // EndpointSpec defines the properties that can be configured to diff --git a/api/types.proto b/api/types.proto index 5ad4a5f431..1f85ad3b84 100644 --- a/api/types.proto +++ b/api/types.proto @@ -80,6 +80,7 @@ message ResourceRequirements { Resources limits = 1; Resources reservations = 2; + // Amount of swap in bytes - can only be used together with a memory limit // -1 means unlimited // a null pointer indicates that the default behaviour of granting twice @@ -90,6 +91,8 @@ message ResourceRequirements { // to the container OS's default - generally 60, or the value predefined in // the image; set to -1 to unset a previously set value google.protobuf.Int64Value memory_swappiness = 4; + + } message Platform { diff --git a/swarmd/cmd/swarmctl/service/flagparser/container.go b/swarmd/cmd/swarmctl/service/flagparser/container.go index 568ebd7c85..d93469eefb 100644 --- a/swarmd/cmd/swarmctl/service/flagparser/container.go +++ b/swarmd/cmd/swarmctl/service/flagparser/container.go @@ -76,5 +76,15 @@ func parseContainer(flags *pflag.FlagSet, spec *api.ServiceSpec) error { } } + if flags.Changed("oom-score-adj") { + + oomScoreAdj, err := flags.GetInt64("oom-score-adj") + if err != nil { + return err + } + + spec.Task.GetContainer().OomScoreAdj = oomScoreAdj + } + return nil } diff --git a/swarmd/cmd/swarmctl/service/flagparser/flags.go b/swarmd/cmd/swarmctl/service/flagparser/flags.go index 47fc032f8b..7146519236 100644 --- a/swarmd/cmd/swarmctl/service/flagparser/flags.go +++ b/swarmd/cmd/swarmctl/service/flagparser/flags.go @@ -50,6 +50,7 @@ func AddServiceFlags(flags *pflag.FlagSet) { flags.String("restart-delay", "5s", "delay between task restarts") flags.Uint64("restart-max-attempts", 0, "maximum number of restart attempts (0 = unlimited)") flags.String("restart-window", "0s", "time window to evaluate restart attempts (0 = unbound)") + flags.Int64("oom-score-adj", 0, "oom score adjustment (-1000 to 1000)") flags.StringSlice("constraint", nil, "Placement constraint (e.g. node.labels.key==value)") diff --git a/swarmd/dockerexec/container.go b/swarmd/dockerexec/container.go index 203349cfdb..2ab35f38ef 100644 --- a/swarmd/dockerexec/container.go +++ b/swarmd/dockerexec/container.go @@ -215,6 +215,7 @@ func (c *containerConfig) hostConfig() *enginecontainer.HostConfig { Isolation: c.isolation(), CapAdd: c.spec().CapabilityAdd, CapDrop: c.spec().CapabilityDrop, + OomScoreAdj: int(c.spec().OomScoreAdj), } // The format of extra hosts on swarmkit is specified in: From b4840290778956e9e931c959e37289ecb937a725 Mon Sep 17 00:00:00 2001 From: plaurent Date: Tue, 11 Jun 2024 11:25:58 -0400 Subject: [PATCH 2/3] make changes per PR Signed-off-by: plaurent Signed-off-by: Boris Bliznioukov --- api/api.pb.txt | 15 --------------- api/specs.pb.go | 6 ++++-- api/specs.proto | 3 ++- api/types.proto | 1 - 4 files changed, 6 insertions(+), 19 deletions(-) diff --git a/api/api.pb.txt b/api/api.pb.txt index 2cf98a6151..a77d1a8965 100755 --- a/api/api.pb.txt +++ b/api/api.pb.txt @@ -11698,21 +11698,6 @@ file { weak_dependency: 2 syntax: "proto3" } -file { - name: "github.com/docker/swarmkit/api/test.proto" - package: "docker.swarmkit.v1" - message_type { - name: "TestService" - field { - name: "TestService" - number: 1 - label: LABEL_OPTIONAL - type: TYPE_UINT64 - json_name: "TestService" - } - } - syntax: "proto3" -} file { name: "github.com/docker/swarmkit/api/watch.proto" package: "docker.swarmkit.v1" diff --git a/api/specs.pb.go b/api/specs.pb.go index a12741879a..959749c9f0 100644 --- a/api/specs.pb.go +++ b/api/specs.pb.go @@ -874,8 +874,10 @@ type ContainerSpec struct { CapabilityDrop []string `protobuf:"bytes,28,rep,name=capability_drop,json=capabilityDrop,proto3" json:"capability_drop,omitempty"` // Ulimits defines the list of ulimits to set in the container. This option // is equivalent to passing --ulimit to docker run. - Ulimits []*ContainerSpec_Ulimit `protobuf:"bytes,29,rep,name=ulimits,proto3" json:"ulimits,omitempty"` - OomScoreAdj int64 `protobuf:"varint,30,opt,name=oom_score_adj,json=oomScoreAdj,proto3" json:"oom_score_adj,omitempty"` + Ulimits []*ContainerSpec_Ulimit `protobuf:"bytes,29,rep,name=ulimits,proto3" json:"ulimits,omitempty"` + // OOmScoreAdj defines the relative value used for destroying a container during an OOM + // Values are between -1000 and 1000 + OomScoreAdj int64 `protobuf:"varint,30,opt,name=oom_score_adj,json=oomScoreAdj,proto3" json:"oom_score_adj,omitempty"` } func (m *ContainerSpec) Reset() { *m = ContainerSpec{} } diff --git a/api/specs.proto b/api/specs.proto index a59d566ddb..c1aeaccf77 100644 --- a/api/specs.proto +++ b/api/specs.proto @@ -372,7 +372,8 @@ message ContainerSpec { // Ulimits defines the list of ulimits to set in the container. This option // is equivalent to passing --ulimit to docker run. repeated Ulimit ulimits = 29; - + // OOmScoreAdj defines the relative value used for destroying a container during an OOM + // Values are between -1000 and 1000 int64 oom_score_adj = 30; } diff --git a/api/types.proto b/api/types.proto index 1f85ad3b84..74f5c7135f 100644 --- a/api/types.proto +++ b/api/types.proto @@ -80,7 +80,6 @@ message ResourceRequirements { Resources limits = 1; Resources reservations = 2; - // Amount of swap in bytes - can only be used together with a memory limit // -1 means unlimited // a null pointer indicates that the default behaviour of granting twice From b886f82c2662194bbbb91ec1e8cb8e3c89f5e86a Mon Sep 17 00:00:00 2001 From: Boris Bliznioukov Date: Sun, 8 Sep 2024 16:50:57 +0300 Subject: [PATCH 3/3] implement PluginAddr interface for CSI plugin Signed-off-by: Boris Bliznioukov --- manager/csi/fakes_test.go | 7 +++++++ manager/csi/plugin.go | 8 ++++++++ 2 files changed, 15 insertions(+) diff --git a/manager/csi/fakes_test.go b/manager/csi/fakes_test.go index 4e434f27ca..69347c220c 100644 --- a/manager/csi/fakes_test.go +++ b/manager/csi/fakes_test.go @@ -3,6 +3,7 @@ package csi import ( "context" "fmt" + "net" "strings" "sync" @@ -209,6 +210,7 @@ func (fpm *fakePluginMaker) newFakePlugin(pa mobyplugin.AddrPlugin, provider Sec p := &fakePlugin{ name: pa.Name(), socket: pa.Addr().String(), + addr: pa.Addr(), swarmToCSI: map[string]string{}, volumesCreated: map[string]*api.Volume{}, volumesDeleted: []string{}, @@ -223,6 +225,7 @@ func (fpm *fakePluginMaker) newFakePlugin(pa mobyplugin.AddrPlugin, provider Sec type fakePlugin struct { name string socket string + addr net.Addr swarmToCSI map[string]string // removedIDs is a set of node IDs for which RemoveNode has been called. removedIDs map[string]struct{} @@ -287,3 +290,7 @@ func (f *fakePlugin) AddNode(swarmID, csiID string) { func (f *fakePlugin) RemoveNode(swarmID string) { f.removedIDs[swarmID] = struct{}{} } + +func (f *fakePlugin) Addr() net.Addr { + return f.addr +} diff --git a/manager/csi/plugin.go b/manager/csi/plugin.go index 77a1f0f4c9..0aacdb33cd 100644 --- a/manager/csi/plugin.go +++ b/manager/csi/plugin.go @@ -4,6 +4,7 @@ import ( "context" "errors" "fmt" + "net" "google.golang.org/grpc" "google.golang.org/grpc/codes" @@ -30,6 +31,7 @@ type Plugin interface { UnpublishVolume(context.Context, *api.Volume, string) error AddNode(swarmID, csiID string) RemoveNode(swarmID string) + Addr() net.Addr } // plugin represents an individual CSI controller plugin @@ -40,6 +42,7 @@ type plugin struct { // socket is the unix socket to connect to this plugin at. socket string + addr net.Addr // provider is the SecretProvider, which allows retrieving secrets for CSI // calls. @@ -80,6 +83,7 @@ func NewPlugin(p mobyplugin.AddrPlugin, provider SecretProvider) Plugin { // TODO(dperny): verify that we do not need to include the Network() // portion of the Addr. socket: fmt.Sprintf("%s://%s", p.Addr().Network(), p.Addr().String()), + addr: p.Addr(), provider: provider, swarmToCSI: map[string]string{}, csiToSwarm: map[string]string{}, @@ -341,3 +345,7 @@ func (p *plugin) makeControllerUnpublishVolumeRequest(v *api.Volume, nodeID stri Secrets: secrets, } } + +func (p *plugin) Addr() net.Addr { + return p.addr +}