vbatts/pkg
1
0
Fork 0
Code Pull requests Releases 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-21 14:53:47 +00:00
parent ea56bc4614
commit cb12e80969
1 changed files with 28 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

24
cgroups/cgroups.go
View file

@ -20,6 +20,7 @@ type Cgroup struct {
Memory int64 `json:"memory,omitempty"` // Memory limit (in bytes) 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 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) 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 // https://www.kernel.org/doc/Documentation/cgroups/cgroups.txt
@ -98,6 +99,7 @@ func (c *Cgroup) Cleanup(root string) error {
get("memory"), get("memory"),
get("devices"), get("devices"),
get("cpu"), get("cpu"),
get("cpuset"),
} { } {
os.RemoveAll(path) os.RemoveAll(path)
} }
@ -150,6 +152,9 @@ func (c *Cgroup) Apply(pid int) error {
if err := c.setupCpu(cgroupRoot, pid); err != nil { if err := c.setupCpu(cgroupRoot, pid); err != nil {
return err return err
} }
if err := c.setupCpuset(cgroupRoot, pid); err != nil {
return err
}
return nil return nil
} }
@ -248,3 +253,22 @@ func (c *Cgroup) setupCpu(cgroupRoot string, pid int) (err error) {
} }
return nil 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
}