cgroups: add support for oom control

HuKeping · HuKeping · commit 295c70865d10 · 2015-03-07T02:49:31.000+08:00
This patch add support for diable OOM Killer.

Signed-off-by: Hu Keping &lt;hukeping@huawei.com&gt;
diff --git a/cgroups/fs/memory.go b/cgroups/fs/memory.go
@@ -56,6 +56,12 @@ func (s *MemoryGroup) Set(path string, cgroup *configs.Cgroup) error {
 		}
 	}
 
+	if cgroup.OomKillDisable {
+		if err := writeFile(path, "memory.oom_control", "1"); err != nil {
+			return err
+		}
+	}
+
 	return nil
 }
 
diff --git a/configs/cgroup.go b/configs/cgroup.go
@@ -51,4 +51,7 @@ type Cgroup struct {
 
 	// Parent slice to use for systemd TODO: remove in favor or parent
 	Slice string `json:"slice"`
+
+	// Whether to disable OOM Killer
+	OomKillDisable bool `json:"oom_kill_disable"`
 }

Original file line number	Diff line number	Diff line change
`@@ -56,6 +56,12 @@ func (s MemoryGroup) Set(path string, cgroup configs.Cgroup) error {`
`56`	`56`	`}`
`57`	`57`	`}`
`58`	`58`
	`59`	`+ if cgroup.OomKillDisable {`
	`60`	`+ if err := writeFile(path, "memory.oom_control", "1"); err != nil {`
	`61`	`+ return err`
	`62`	`+ }`
	`63`	`+ }`
	`64`	`+`
`59`	`65`	`return nil`
`60`	`66`	`}`
`61`	`67`
Original file line number	Diff line number	Diff line change
`@@ -51,4 +51,7 @@ type Cgroup struct {`
`51`	`51`
`52`	`52`	`// Parent slice to use for systemd TODO: remove in favor or parent`
`53`	`53`	Slice string `json:"slice"`
	`54`	`+`
	`55`	`+ // Whether to disable OOM Killer`
	`56`	+ OomKillDisable bool `json:"oom_kill_disable"`
`54`	`57`	`}`