jasder
/
runc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge pull request #853 from hqhq/fix_set_kernel_memory 

Remove use_hierarchy check when set kernel memory
This commit is contained in:
Mrunal Patel 2016-05-31 08:31:42 -07:00
parent 1df636ae24 6fa490c664
commit 88bb59e35f
1 changed files with 1 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
libcontainer/cgroups/fs/memory.go
View File

@ -76,22 +76,13 @@ func (s *MemoryGroup) SetKernelMemory(path string, cgroup *configs.Cgroup) error
} }
if !kmemInitialized { if !kmemInitialized {
// If hierarchy is set, we can't change the limit
usesHierarchy, err := getCgroupParamUint(path, "memory.use_hierarchy")
if err != nil {
return err
}
if usesHierarchy != 0 {
return fmt.Errorf("cannot initialize kmem.limit_in_bytes if use_hierarchy is already set")
}
// If there's already tasks in the cgroup, we can't change the limit either // If there's already tasks in the cgroup, we can't change the limit either
tasks, err := getCgroupParamString(path, "tasks") tasks, err := getCgroupParamString(path, "tasks")
if err != nil { if err != nil {
return err return err
} }
if tasks != "" { if tasks != "" {
return fmt.Errorf("cannot initialize kmem.limit_in_bytes after task have joined this cgroup") return fmt.Errorf("cannot set kmem.limit_in_bytes after task have joined this cgroup")
} }
} }