clearlinux/docker
2
0
Fork 0
mirror of https://github.com/clearlinux/docker.git synced 2026-10-03 23:38:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Add cpuset.cpus to cgroups and native driver options

Browse Source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby
2014-03-24 05:33:11 +00:00
parent 2c58a1e288
commit 9a7be1b015
2 changed files with 57 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files
pkg/cgroups/cgroups.go
+28 -4
View File
@@ -16,10 +16,11 @@ type Cgroup struct {
Name string `json:"name,omitempty"`
Parent string `json:"parent,omitempty"`
DeviceAccess bool `json:"device_access,omitempty"` // name of parent cgroup or slice
Memory int64 `json:"memory,omitempty"` // Memory limit (in bytes)
MemorySwap int64 `json:"memory_swap,omitempty"` // Total memory usage (memory + swap); set `-1' to disable swap
CpuShares int64 `json:"cpu_shares,omitempty"` // CPU shares (relative weight vs. other containers)
DeviceAccess bool `json:"device_access,omitempty"` // name of parent cgroup or slice
Memory int64 `json:"memory,omitempty"` // Memory limit (in bytes)
MemorySwap int64 `json:"memory_swap,omitempty"` // Total memory usage (memory + swap); set `-1' to disable swap
CpuShares int64 `json:"cpu_shares,omitempty"` // CPU shares (relative weight vs. other containers)
CpusetCpus string `json:"cpuset_cpus,omitempty"` // CPU to use
}
// https://www.kernel.org/doc/Documentation/cgroups/cgroups.txt
@@ -98,6 +99,7 @@ func (c *Cgroup) Cleanup(root string) error {
get("memory"),
get("devices"),
get("cpu"),
get("cpuset"),
} {
os.RemoveAll(path)
}
@@ -150,6 +152,9 @@ func (c *Cgroup) Apply(pid int) error {
if err := c.setupCpu(cgroupRoot, pid); err != nil {
return err
}
if err := c.setupCpuset(cgroupRoot, pid); err != nil {
return err
}
return nil
}
@@ -248,3 +253,22 @@ func (c *Cgroup) setupCpu(cgroupRoot string, pid int) (err error) {
}
return nil
}
func (c *Cgroup) setupCpuset(cgroupRoot string, pid int) (err error) {
if c.CpusetCpus != "" {
dir, err := c.Join(cgroupRoot, "cpuset", pid)
if err != nil {
return err
}
defer func() {
if err != nil {
os.RemoveAll(dir)
}
}()
if err := writeFile(dir, "cpuset.cpus", c.CpusetCpus); err != nil {
return err
}
}
return nil
}