kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Fix kernel memory limit

Browse source 
Signed-off-by: Qiang Huang <h.huangqiang@huawei.com>
This commit is contained in:
Qiang Huang 2015-11-28 09:47:25 +08:00
parent b8c21783f0
commit dd7b4fd651
2 changed files with 4 additions and 1 deletions
Download patch file Download diff file Expand all files Collapse all files

1
daemon/execdriver/driver_unix.go
View file

@ -161,6 +161,7 @@ func SetupCgroups(container *configs.Config, c *Command) error {
container.Cgroups.Memory = c.Resources.Memory container.Cgroups.Memory = c.Resources.Memory
container.Cgroups.MemoryReservation = c.Resources.MemoryReservation container.Cgroups.MemoryReservation = c.Resources.MemoryReservation
container.Cgroups.MemorySwap = c.Resources.MemorySwap container.Cgroups.MemorySwap = c.Resources.MemorySwap
container.Cgroups.KernelMemory = c.Resources.KernelMemory
container.Cgroups.CpusetCpus = c.Resources.CpusetCpus container.Cgroups.CpusetCpus = c.Resources.CpusetCpus
container.Cgroups.CpusetMems = c.Resources.CpusetMems container.Cgroups.CpusetMems = c.Resources.CpusetMems
container.Cgroups.CpuPeriod = c.Resources.CPUPeriod container.Cgroups.CpuPeriod = c.Resources.CPUPeriod

4
integration-cli/docker_cli_run_unix_test.go
View file

@ -162,7 +162,9 @@ func (s *DockerSuite) TestRunWithCpuPeriod(c *check.C) {
func (s *DockerSuite) TestRunWithKernelMemory(c *check.C) { func (s *DockerSuite) TestRunWithKernelMemory(c *check.C) {
testRequires(c, kernelMemorySupport) testRequires(c, kernelMemorySupport)
dockerCmd(c, "run", "--kernel-memory", "50M", "--name", "test1", "busybox", "true") file := "/sys/fs/cgroup/memory/memory.kmem.limit_in_bytes"
out, _ := dockerCmd(c, "run", "--kernel-memory", "50M", "--name", "test1", "busybox", "cat", file)
c.Assert(out, checker.Contains, "52428800")
out, err := inspectField("test1", "HostConfig.KernelMemory") out, err := inspectField("test1", "HostConfig.KernelMemory")
c.Assert(err, check.IsNil) c.Assert(err, check.IsNil)