Merge pull request #398 from joshwget/mem-swappiness

Add mem_swappiness

Author: joshwget

config/types.go

@@ -45,6 +45,7 @@ type ServiceConfigV1 struct {
 	MacAddress    string               `yaml:"mac_address,omitempty"`
 	MemLimit      yaml.StringorInt     `yaml:"mem_limit,omitempty"`
 	MemSwapLimit  yaml.StringorInt     `yaml:"memswap_limit,omitempty"`
+	MemSwappiness yaml.StringorInt     `yaml:"mem_swappiness,omitempty"`
 	Name          string               `yaml:"name,omitempty"`
 	Net           string               `yaml:"net,omitempty"`
 	OomScoreAdj   yaml.StringorInt     `yaml:"oom_score_adj,omitempty"`
@@ -112,6 +113,7 @@ type ServiceConfig struct {
 	MacAddress    string               `yaml:"mac_address,omitempty"`
 	MemLimit      yaml.StringorInt     `yaml:"mem_limit,omitempty"`
 	MemSwapLimit  yaml.StringorInt     `yaml:"memswap_limit,omitempty"`
+	MemSwappiness yaml.StringorInt     `yaml:"mem_swappiness,omitempty"`
 	NetworkMode   string               `yaml:"network_mode,omitempty"`
 	Networks      *yaml.Networks       `yaml:"networks,omitempty"`
 	OomScoreAdj   yaml.StringorInt     `yaml:"oom_score_adj,omitempty"`

docker/service/convert.go

@@ -181,15 +181,18 @@ func Convert(c *config.ServiceConfig, ctx project.Context, clientFactory compose
 		}
 	}
 
+	memorySwappiness := int64(c.MemSwappiness)
+
 	resources := container.Resources{
-		CgroupParent: c.CgroupParent,
-		Memory:       int64(c.MemLimit),
-		MemorySwap:   int64(c.MemSwapLimit),
-		CPUShares:    int64(c.CPUShares),
-		CPUQuota:     int64(c.CPUQuota),
-		CpusetCpus:   c.CPUSet,
-		Ulimits:      ulimits,
-		Devices:      deviceMappings,
+		CgroupParent:     c.CgroupParent,
+		Memory:           int64(c.MemLimit),
+		MemorySwap:       int64(c.MemSwapLimit),
+		MemorySwappiness: &memorySwappiness,
+		CPUShares:        int64(c.CPUShares),
+		CPUQuota:         int64(c.CPUQuota),
+		CpusetCpus:       c.CPUSet,
+		Ulimits:          ulimits,
+		Devices:          deviceMappings,
 	}
 
 	networkMode := c.NetworkMode

docker/service/convert_test.go

@@ -98,6 +98,17 @@ func TestGroupAdd(t *testing.T) {
 	}, hostCfg.GroupAdd))
 }
 
+func TestMemSwappiness(t *testing.T) {
+	ctx := &ctx.Context{}
+	sc := &config.ServiceConfig{
+		MemSwappiness: yaml.StringorInt(10),
+	}
+	_, hostCfg, err := Convert(sc, ctx.Context, nil)
+	assert.Nil(t, err)
+
+	assert.Equal(t, int64(10), *hostCfg.MemorySwappiness)
+}
+
 func TestOomScoreAdj(t *testing.T) {
 	ctx := &ctx.Context{}
 	sc := &config.ServiceConfig{