Merge pull request #3177 from psaintlaurent/ENGINE-903

Add OOM adjustment flag to hostconfig via swarmctl cli

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 {

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,9 @@ 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;
 }
 
 // EndpointSpec defines the properties that can be configured to

api/types.proto

@@ -90,6 +90,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 {

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
 }

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)")
 

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: