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

Don't change memswap value in libcontainer 

As discussed in https://github.com/docker/libcontainer/issues/616,
remove this logic in libcontainer.

Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
This commit is contained in:
Qiang Huang 2015-06-11 08:54:24 +08:00
parent c963786c6e
commit f7c16f1d3e
3 changed files with 2 additions and 43 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
cgroups/fs/memory.go
View File

@ -46,12 +46,6 @@ func (s *MemoryGroup) Set(path string, cgroup *configs.Cgroup) error {
return err return err
} }
} }
// By default, MemorySwap is set to twice the size of Memory.
if cgroup.MemorySwap == 0 && cgroup.Memory != 0 {
if err := writeFile(path, "memory.memsw.limit_in_bytes", strconv.FormatInt(cgroup.Memory*2, 10)); err != nil {
return err
}
}
if cgroup.MemorySwap > 0 { if cgroup.MemorySwap > 0 {
if err := writeFile(path, "memory.memsw.limit_in_bytes", strconv.FormatInt(cgroup.MemorySwap, 10)); err != nil { if err := writeFile(path, "memory.memsw.limit_in_bytes", strconv.FormatInt(cgroup.MemorySwap, 10)); err != nil {
return err return err

29
cgroups/fs/memory_test.go
View File

@ -85,35 +85,6 @@ func TestMemorySetMemoryswap(t *testing.T) {
} }
} }
func TestMemorySetMemoryswapDefault(t *testing.T) {
helper := NewCgroupTestUtil("memory", t)
defer helper.cleanup()
const (
memoryBefore = 209715200 // 200M
memoryAfter = 314572800 // 300M
memoryswapAfter = 629145600 // 300M*2
)
helper.writeFileContents(map[string]string{
"memory.limit_in_bytes": strconv.Itoa(memoryBefore),
})
helper.CgroupData.c.Memory = memoryAfter
memory := &MemoryGroup{}
if err := memory.Set(helper.CgroupPath, helper.CgroupData.c); err != nil {
t.Fatal(err)
}
value, err := getCgroupParamUint(helper.CgroupPath, "memory.memsw.limit_in_bytes")
if err != nil {
t.Fatalf("Failed to parse memory.memsw.limit_in_bytes - %s", err)
}
if value != memoryswapAfter {
t.Fatal("Got the wrong value, set memory.memsw.limit_in_bytes failed.")
}
}
func TestMemorySetKernelMemory(t *testing.T) { func TestMemorySetKernelMemory(t *testing.T) {
helper := NewCgroupTestUtil("memory", t) helper := NewCgroupTestUtil("memory", t)
defer helper.cleanup() defer helper.cleanup()

10
cgroups/systemd/apply_systemd.go
View File

@ -469,14 +469,8 @@ func joinMemory(c *configs.Cgroup, pid int) error {
} }
// -1 disables memoryswap // -1 disables memoryswap
if c.Memory != 0 && c.MemorySwap >= 0 { if c.MemorySwap > 0 {
memorySwap := c.MemorySwap err = writeFile(path, "memory.memsw.limit_in_bytes", strconv.FormatInt(c.MemorySwap, 10))
if memorySwap == 0 {
// By default, MemorySwap is set to twice the size of RAM.
memorySwap = c.Memory * 2
}
err = writeFile(path, "memory.memsw.limit_in_bytes", strconv.FormatInt(memorySwap, 10))
if err != nil { if err != nil {
return err return err
} }