Merge pull request opencontainers#985 from masters-of-cats/master

config-linux: Add Memory cgroup's use_hierarchy

Author: vbatts

config-linux.md

@@ -275,6 +275,8 @@ The following properties do not specify memory limits, but are covered by the `m
     If enabled (`false`), tasks that attempt to consume more memory than they are allowed are immediately killed by the OOM killer.
     The OOM killer is enabled by default in every cgroup using the `memory` subsystem.
     To disable it, specify a value of `true`.
+* **`useHierarchy`** *(bool, OPTIONAL)* - enables or disables hierarchical memory accounting.
+    If enabled (`true`), child cgroups will share the memory limits of this cgroup.
 
 #### Example
 

schema/config-linux.json

@@ -160,6 +160,9 @@
                             },
                             "disableOOMKiller": {
                                 "type": "boolean"
+                            },
+                            "useHierarchy": {
+                                "type": "boolean"
                             }
                         }
                     },

schema/test/config/good/spec-example.json

@@ -246,7 +246,8 @@
                 "kernel": -1,
                 "kernelTCP": -1,
                 "swappiness": 0,
-                "disableOOMKiller": false
+                "disableOOMKiller": false,
+                "useHierarchy": false
             },
             "cpu": {
                 "shares": 1024,

specs-go/config.go

@@ -293,6 +293,8 @@ type LinuxMemory struct {
 	Swappiness *uint64 `json:"swappiness,omitempty"`
 	// DisableOOMKiller disables the OOM killer for out of memory conditions
 	DisableOOMKiller *bool `json:"disableOOMKiller,omitempty"`
+	// Enables hierarchical memory accounting
+	UseHierarchy *bool `json:"useHierarchy,omitempty"`
 }
 
 // LinuxCPU for Linux cgroup 'cpu' resource management