From 8cc8aca9cc8e50ee8d9ab26a453e183353cd439b Mon Sep 17 00:00:00 2001 From: Michael Crosby Date: Fri, 18 Apr 2014 21:34:26 -0700 Subject: [PATCH] Move raw cgroups into fs package (filesystem) Docker-DCO-1.1-Signed-off-by: Michael Crosby (github: crosbymichael) --- cgroups/{ => fs}/apply_raw.go | 41 ++++++++++++++++++++--------------- cgroups/utils.go | 6 ----- libcontainer/nsinit/exec.go | 3 ++- 3 files changed, 26 insertions(+), 24 deletions(-) rename cgroups/{ => fs}/apply_raw.go (78%) diff --git a/cgroups/apply_raw.go b/cgroups/fs/apply_raw.go similarity index 78% rename from cgroups/apply_raw.go rename to cgroups/fs/apply_raw.go index 471d3fc..d8267bf 100644 --- a/cgroups/apply_raw.go +++ b/cgroups/fs/apply_raw.go @@ -1,10 +1,13 @@ -package cgroups +package fs import ( "fmt" + "io/ioutil" "os" "path/filepath" "strconv" + + "github.com/dotcloud/docker/pkg/cgroups" ) type rawCgroup struct { @@ -12,7 +15,7 @@ type rawCgroup struct { cgroup string } -func rawApply(c *Cgroup, pid int) (ActiveCgroup, error) { +func Apply(c *cgroups.Cgroup, pid int) (cgroups.ActiveCgroup, error) { // We have two implementation of cgroups support, one is based on // systemd and the dbus api, and one is based on raw cgroup fs operations // following the pre-single-writer model docs at: @@ -20,7 +23,7 @@ func rawApply(c *Cgroup, pid int) (ActiveCgroup, error) { // // we can pick any subsystem to find the root - cgroupRoot, err := FindCgroupMountpoint("cpu") + cgroupRoot, err := cgroups.FindCgroupMountpoint("cpu") if err != nil { return nil, err } @@ -39,7 +42,7 @@ func rawApply(c *Cgroup, pid int) (ActiveCgroup, error) { root: cgroupRoot, cgroup: cgroup, } - for _, g := range []func(*Cgroup, int) error{ + for _, g := range []func(*cgroups.Cgroup, int) error{ raw.setupDevices, raw.setupMemory, raw.setupCpu, @@ -58,7 +61,7 @@ func rawApply(c *Cgroup, pid int) (ActiveCgroup, error) { } func (raw *rawCgroup) path(subsystem string) (string, error) { - initPath, err := GetInitCgroupDir(subsystem) + initPath, err := cgroups.GetInitCgroupDir(subsystem) if err != nil { return "", err } @@ -79,7 +82,7 @@ func (raw *rawCgroup) join(subsystem string, pid int) (string, error) { return path, nil } -func (raw *rawCgroup) setupDevices(c *Cgroup, pid int) (err error) { +func (raw *rawCgroup) setupDevices(c *cgroups.Cgroup, pid int) (err error) { dir, err := raw.join("devices", pid) if err != nil { return err @@ -133,7 +136,7 @@ func (raw *rawCgroup) setupDevices(c *Cgroup, pid int) (err error) { return nil } -func (raw *rawCgroup) setupMemory(c *Cgroup, pid int) (err error) { +func (raw *rawCgroup) setupMemory(c *cgroups.Cgroup, pid int) (err error) { dir, err := raw.join("memory", pid) // only return an error for memory if it was not specified if err != nil && (c.Memory != 0 || c.MemorySwap != 0) { @@ -165,7 +168,7 @@ func (raw *rawCgroup) setupMemory(c *Cgroup, pid int) (err error) { return nil } -func (raw *rawCgroup) setupCpu(c *Cgroup, pid int) (err error) { +func (raw *rawCgroup) setupCpu(c *cgroups.Cgroup, pid int) (err error) { // We always want to join the cpu group, to allow fair cpu scheduling // on a container basis dir, err := raw.join("cpu", pid) @@ -180,7 +183,7 @@ func (raw *rawCgroup) setupCpu(c *Cgroup, pid int) (err error) { return nil } -func (raw *rawCgroup) setupCpuset(c *Cgroup, pid int) (err error) { +func (raw *rawCgroup) setupCpuset(c *cgroups.Cgroup, pid int) (err error) { // we don't want to join this cgroup unless it is specified if c.CpusetCpus != "" { dir, err := raw.join("cpuset", pid) @@ -200,33 +203,33 @@ func (raw *rawCgroup) setupCpuset(c *Cgroup, pid int) (err error) { return nil } -func (raw *rawCgroup) setupCpuacct(c *Cgroup, pid int) error { +func (raw *rawCgroup) setupCpuacct(c *cgroups.Cgroup, pid int) error { // we just want to join this group even though we don't set anything - if _, err := raw.join("cpuacct", pid); err != nil && err != ErrNotFound { + if _, err := raw.join("cpuacct", pid); err != nil && err != cgroups.ErrNotFound { return err } return nil } -func (raw *rawCgroup) setupBlkio(c *Cgroup, pid int) error { +func (raw *rawCgroup) setupBlkio(c *cgroups.Cgroup, pid int) error { // we just want to join this group even though we don't set anything - if _, err := raw.join("blkio", pid); err != nil && err != ErrNotFound { + if _, err := raw.join("blkio", pid); err != nil && err != cgroups.ErrNotFound { return err } return nil } -func (raw *rawCgroup) setupPerfevent(c *Cgroup, pid int) error { +func (raw *rawCgroup) setupPerfevent(c *cgroups.Cgroup, pid int) error { // we just want to join this group even though we don't set anything - if _, err := raw.join("perf_event", pid); err != nil && err != ErrNotFound { + if _, err := raw.join("perf_event", pid); err != nil && err != cgroups.ErrNotFound { return err } return nil } -func (raw *rawCgroup) setupFreezer(c *Cgroup, pid int) error { +func (raw *rawCgroup) setupFreezer(c *cgroups.Cgroup, pid int) error { // we just want to join this group even though we don't set anything - if _, err := raw.join("freezer", pid); err != nil && err != ErrNotFound { + if _, err := raw.join("freezer", pid); err != nil && err != cgroups.ErrNotFound { return err } return nil @@ -254,3 +257,7 @@ func (raw *rawCgroup) Cleanup() error { } return nil } + +func writeFile(dir, file, data string) error { + return ioutil.WriteFile(filepath.Join(dir, file), []byte(data), 0700) +} diff --git a/cgroups/utils.go b/cgroups/utils.go index 82d5a95..02a7f35 100644 --- a/cgroups/utils.go +++ b/cgroups/utils.go @@ -3,9 +3,7 @@ package cgroups import ( "bufio" "io" - "io/ioutil" "os" - "path/filepath" "strings" "github.com/dotcloud/docker/pkg/mount" @@ -67,7 +65,3 @@ func parseCgroupFile(subsystem string, r io.Reader) (string, error) { } return "", ErrNotFound } - -func writeFile(dir, file, data string) error { - return ioutil.WriteFile(filepath.Join(dir, file), []byte(data), 0700) -} diff --git a/libcontainer/nsinit/exec.go b/libcontainer/nsinit/exec.go index 7a315d6..e76e060 100644 --- a/libcontainer/nsinit/exec.go +++ b/libcontainer/nsinit/exec.go @@ -8,6 +8,7 @@ import ( "syscall" "github.com/dotcloud/docker/pkg/cgroups" + "github.com/dotcloud/docker/pkg/cgroups/fs" "github.com/dotcloud/docker/pkg/cgroups/systemd" "github.com/dotcloud/docker/pkg/libcontainer" "github.com/dotcloud/docker/pkg/libcontainer/network" @@ -104,7 +105,7 @@ func (ns *linuxNs) SetupCgroups(container *libcontainer.Container, nspid int) (c if systemd.UseSystemd() { return systemd.Apply(c, nspid) } - return rawApply(c, nspid) + return fs.Apply(c, nspid) } return nil, nil }