vbatts/pkg
1
0
Fork 0
Code Pull requests Releases Activity

Ignore not exist errors for joining default subsystems

Browse source 
Docker-DCO-1.1-Signed-off-by: Michael Crosby <michael@crosbymichael.com> (github: crosbymichael)
This commit is contained in:
Michael Crosby 2014-04-14 00:02:01 +00:00
parent b0481297a1
commit f95367f57f
2 changed files with 24 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
cgroups/apply_raw.go
View file

@ -135,6 +135,7 @@ func (raw *rawCgroup) setupDevices(c *Cgroup, pid int) (err error) {
func (raw *rawCgroup) setupMemory(c *Cgroup, pid int) (err error) { func (raw *rawCgroup) setupMemory(c *Cgroup, pid int) (err error) {
dir, err := raw.join("memory", pid) 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) { if err != nil && (c.Memory != 0 || c.MemorySwap != 0) {
return err return err
} }
@ -145,7 +146,6 @@ func (raw *rawCgroup) setupMemory(c *Cgroup, pid int) (err error) {
}() }()
if c.Memory != 0 || c.MemorySwap != 0 { if c.Memory != 0 || c.MemorySwap != 0 {
if c.Memory != 0 { if c.Memory != 0 {
if err := writeFile(dir, "memory.limit_in_bytes", strconv.FormatInt(c.Memory, 10)); err != nil { if err := writeFile(dir, "memory.limit_in_bytes", strconv.FormatInt(c.Memory, 10)); err != nil {
return err return err
@ -202,27 +202,35 @@ func (raw *rawCgroup) setupCpuset(c *Cgroup, pid int) (err error) {
func (raw *rawCgroup) setupCpuacct(c *Cgroup, pid int) error { func (raw *rawCgroup) setupCpuacct(c *Cgroup, pid int) error {
// we just want to join this group even though we don't set anything // we just want to join this group even though we don't set anything
_, err := raw.join("cpuacct", pid) if _, err := raw.join("cpuacct", pid); err != nil && err != ErrNotFound {
return err return err
} }
return nil
}
func (raw *rawCgroup) setupBlkio(c *Cgroup, pid int) error { func (raw *rawCgroup) setupBlkio(c *Cgroup, pid int) error {
// we just want to join this group even though we don't set anything // we just want to join this group even though we don't set anything
_, err := raw.join("blkio", pid) if _, err := raw.join("blkio", pid); err != nil && err != ErrNotFound {
return err return err
} }
return nil
}
func (raw *rawCgroup) setupPerfevent(c *Cgroup, pid int) error { func (raw *rawCgroup) setupPerfevent(c *Cgroup, pid int) error {
// we just want to join this group even though we don't set anything // we just want to join this group even though we don't set anything
_, err := raw.join("perf_event", pid) if _, err := raw.join("perf_event", pid); err != nil && err != ErrNotFound {
return err return err
} }
return nil
}
func (raw *rawCgroup) setupFreezer(c *Cgroup, pid int) error { func (raw *rawCgroup) setupFreezer(c *Cgroup, pid int) error {
// we just want to join this group even though we don't set anything // we just want to join this group even though we don't set anything
_, err := raw.join("freezer", pid) if _, err := raw.join("freezer", pid); err != nil && err != ErrNotFound {
return err return err
} }
return nil
}
func (raw *rawCgroup) Cleanup() error { func (raw *rawCgroup) Cleanup() error {
get := func(subsystem string) string { get := func(subsystem string) string {

10
cgroups/cgroups.go
View file

@ -2,7 +2,7 @@ package cgroups
import ( import (
"bufio" "bufio"
"fmt" "errors"
"github.com/dotcloud/docker/pkg/mount" "github.com/dotcloud/docker/pkg/mount"
"io" "io"
"io/ioutil" "io/ioutil"
@ -11,6 +11,10 @@ import (
"strings" "strings"
) )
var (
ErrNotFound = errors.New("mountpoint not found")
)
type Cgroup struct { type Cgroup struct {
Name string `json:"name,omitempty"` Name string `json:"name,omitempty"`
Parent string `json:"parent,omitempty"` Parent string `json:"parent,omitempty"`
@ -44,7 +48,7 @@ func FindCgroupMountpoint(subsystem string) (string, error) {
} }
} }
} }
return "", fmt.Errorf("cgroup mountpoint not found for %s", subsystem) return "", ErrNotFound
} }
// Returns the relative path to the cgroup docker is running in. // Returns the relative path to the cgroup docker is running in.
@ -82,7 +86,7 @@ func parseCgroupFile(subsystem string, r io.Reader) (string, error) {
} }
} }
} }
return "", fmt.Errorf("cgroup '%s' not found in /proc/self/cgroup", subsystem) return "", ErrNotFound
} }
func writeFile(dir, file, data string) error { func writeFile(dir, file, data string) error {