Merge pull request #431 from lox/support-memory-reservation

Support mem_reservation service property

Author: vdemeester

config/schema.go

@@ -86,6 +86,7 @@ var schemaDataV1 = `{
         "log_opt": {"type": "object"},
         "mac_address": {"type": "string"},
         "mem_limit": {"type": ["number", "string"]},
+        "mem_reservation": {"type": ["number", "string"]},
         "memswap_limit": {"type": ["number", "string"]},
         "mem_swappiness": {"type": "integer"},
         "net": {"type": "string"},
@@ -298,6 +299,7 @@ var servicesSchemaDataV2 = `{
 
         "mac_address": {"type": "string"},
         "mem_limit": {"type": ["number", "string"]},
+        "mem_reservation": {"type": ["number", "string"]},
         "memswap_limit": {"type": ["number", "string"]},
         "mem_swappiness": {"type": "integer"},
         "network_mode": {"type": "string"},

config/types.go

@@ -117,6 +117,7 @@ type ServiceConfig struct {
 	Logging        Log                  `yaml:"logging,omitempty"`
 	MacAddress     string               `yaml:"mac_address,omitempty"`
 	MemLimit       yaml.MemStringorInt  `yaml:"mem_limit,omitempty"`
+	MemReservation yaml.MemStringorInt  `yaml:"mem_reservation,omitempty"`
 	MemSwapLimit   yaml.MemStringorInt  `yaml:"memswap_limit,omitempty"`
 	MemSwappiness  yaml.MemStringorInt  `yaml:"mem_swappiness,omitempty"`
 	NetworkMode    string               `yaml:"network_mode,omitempty"`

docker/service/convert.go

@@ -182,16 +182,17 @@ 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),
-		MemorySwappiness: &memorySwappiness,
-		CPUShares:        int64(c.CPUShares),
-		CPUQuota:         int64(c.CPUQuota),
-		CpusetCpus:       c.CPUSet,
-		Ulimits:          ulimits,
-		Devices:          deviceMappings,
-		OomKillDisable:   &c.OomKillDisable,
+		CgroupParent:      c.CgroupParent,
+		Memory:            int64(c.MemLimit),
+		MemoryReservation: int64(c.MemReservation),
+		MemorySwap:        int64(c.MemSwapLimit),
+		MemorySwappiness:  &memorySwappiness,
+		CPUShares:         int64(c.CPUShares),
+		CPUQuota:          int64(c.CPUQuota),
+		CpusetCpus:        c.CPUSet,
+		Ulimits:           ulimits,
+		Devices:           deviceMappings,
+		OomKillDisable:    &c.OomKillDisable,
 	}
 
 	networkMode := c.NetworkMode

docker/service/convert_test.go

@@ -138,6 +138,17 @@ func TestMemSwappiness(t *testing.T) {
 	assert.Equal(t, int64(10), *hostCfg.MemorySwappiness)
 }
 
+func TestMemReservation(t *testing.T) {
+	ctx := &ctx.Context{}
+	sc := &config.ServiceConfig{
+		MemReservation: 100000,
+	}
+	_, hostCfg, err := Convert(sc, ctx.Context, nil)
+	assert.Nil(t, err)
+
+	assert.Equal(t, int64(100000), hostCfg.MemoryReservation)
+}
+
 func TestOomKillDisable(t *testing.T) {
 	ctx := &ctx.Context{}
 	sc := &config.ServiceConfig{