0ct0pu5/moby
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Merge pull request #18272 from hqhq/hq_fix_kernel_memory

Browse source 
Fix kernel memory limit
This commit is contained in:
Phil Estes 2015-11-30 10:01:45 -05:00
commit f3ff09f578
2 changed files with 68 additions and 24 deletions
Show stats 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.MemoryReservation = c.Resources.MemoryReservation
container.Cgroups.MemorySwap = c.Resources.MemorySwap
container.Cgroups.KernelMemory = c.Resources.KernelMemory
container.Cgroups.CpusetCpus = c.Resources.CpusetCpus
container.Cgroups.CpusetMems = c.Resources.CpusetMems
container.Cgroups.CpuPeriod = c.Resources.CPUPeriod

91
integration-cli/docker_cli_run_unix_test.go
View file

@ -134,25 +134,24 @@ func (s *DockerSuite) TestRunAttachDetach(c *check.C) {
}
}
// "test" should be printed
func (s *DockerSuite) TestRunEchoStdoutWithCPUQuota(c *check.C) {
func (s *DockerSuite) TestRunWithCPUQuota(c *check.C) {
testRequires(c, cpuCfsQuota)
out, _, err := dockerCmdWithError("run", "--cpu-quota", "8000", "--name", "test", "busybox", "echo", "test")
c.Assert(err, checker.IsNil, check.Commentf("failed to run container, output: %q", out))
out = strings.TrimSpace(out)
c.Assert(out, checker.Equals, "test", check.Commentf("container should've printed 'test'"))
file := "/sys/fs/cgroup/cpu/cpu.cfs_quota_us"
out, _ := dockerCmd(c, "run", "--cpu-quota", "8000", "--name", "test", "busybox", "cat", file)
c.Assert(strings.TrimSpace(out), checker.Equals, "8000")
out, err = inspectField("test", "HostConfig.CpuQuota")
out, err := inspectField("test", "HostConfig.CpuQuota")
c.Assert(err, check.IsNil)
c.Assert(out, checker.Equals, "8000", check.Commentf("setting the CPU CFS quota failed"))
}
func (s *DockerSuite) TestRunWithCpuPeriod(c *check.C) {
testRequires(c, cpuCfsPeriod)
dockerCmd(c, "run", "--cpu-period", "50000", "--name", "test", "busybox", "true")
file := "/sys/fs/cgroup/cpu/cpu.cfs_period_us"
out, _ := dockerCmd(c, "run", "--cpu-period", "50000", "--name", "test", "busybox", "cat", file)
c.Assert(strings.TrimSpace(out), checker.Equals, "50000")
out, err := inspectField("test", "HostConfig.CpuPeriod")
c.Assert(err, check.IsNil)
@ -162,7 +161,9 @@ func (s *DockerSuite) TestRunWithCpuPeriod(c *check.C) {
func (s *DockerSuite) TestRunWithKernelMemory(c *check.C) {
testRequires(c, kernelMemorySupport)
dockerCmd(c, "run", "--kernel-memory", "50M", "--name", "test1", "busybox", "true")
file := "/sys/fs/cgroup/memory/memory.kmem.limit_in_bytes"
stdout, _, _ := dockerCmdWithStdoutStderr(c, "run", "--kernel-memory", "50M", "--name", "test1", "busybox", "cat", file)
c.Assert(strings.TrimSpace(stdout), checker.Equals, "52428800")
out, err := inspectField("test1", "HostConfig.KernelMemory")
c.Assert(err, check.IsNil)
@ -174,11 +175,16 @@ func (s *DockerSuite) TestRunWithKernelMemory(c *check.C) {
c.Assert(out, checker.Contains, expected)
}
// "test" should be printed
func (s *DockerSuite) TestRunEchoStdoutWitCPUShares(c *check.C) {
func (s *DockerSuite) TestRunWithCPUShares(c *check.C) {
testRequires(c, cpuShare)
out, _ := dockerCmd(c, "run", "--cpu-shares", "1000", "busybox", "echo", "test")
c.Assert(out, checker.Equals, "test\n", check.Commentf("container should've printed 'test'"))
file := "/sys/fs/cgroup/cpu/cpu.shares"
out, _ := dockerCmd(c, "run", "--cpu-shares", "1000", "--name", "test", "busybox", "cat", file)
c.Assert(strings.TrimSpace(out), checker.Equals, "1000")
out, err := inspectField("test", "HostConfig.CPUShares")
c.Assert(err, check.IsNil)
c.Assert(out, check.Equals, "1000")
}
// "test" should be printed
@ -191,17 +197,38 @@ func (s *DockerSuite) TestRunEchoStdoutWithCPUSharesAndMemoryLimit(c *check.C) {
func (s *DockerSuite) TestRunWithCpusetCpus(c *check.C) {
testRequires(c, cgroupCpuset)
dockerCmd(c, "run", "--cpuset-cpus", "0", "busybox", "true")
file := "/sys/fs/cgroup/cpuset/cpuset.cpus"
out, _ := dockerCmd(c, "run", "--cpuset-cpus", "0", "--name", "test", "busybox", "cat", file)
c.Assert(strings.TrimSpace(out), checker.Equals, "0")
out, err := inspectField("test", "HostConfig.CpusetCpus")
c.Assert(err, check.IsNil)
c.Assert(out, check.Equals, "0")
}
func (s *DockerSuite) TestRunWithCpusetMems(c *check.C) {
testRequires(c, cgroupCpuset)
dockerCmd(c, "run", "--cpuset-mems", "0", "busybox", "true")
file := "/sys/fs/cgroup/cpuset/cpuset.mems"
out, _ := dockerCmd(c, "run", "--cpuset-mems", "0", "--name", "test", "busybox", "cat", file)
c.Assert(strings.TrimSpace(out), checker.Equals, "0")
out, err := inspectField("test", "HostConfig.CpusetMems")
c.Assert(err, check.IsNil)
c.Assert(out, check.Equals, "0")
}
func (s *DockerSuite) TestRunWithBlkioWeight(c *check.C) {
testRequires(c, blkioWeight)
dockerCmd(c, "run", "--blkio-weight", "300", "busybox", "true")
file := "/sys/fs/cgroup/blkio/blkio.weight"
out, _ := dockerCmd(c, "run", "--blkio-weight", "300", "--name", "test", "busybox", "cat", file)
c.Assert(strings.TrimSpace(out), checker.Equals, "300")
out, err := inspectField("test", "HostConfig.BlkioWeight")
c.Assert(err, check.IsNil)
c.Assert(out, check.Equals, "300")
}
func (s *DockerSuite) TestRunWithBlkioInvalidWeight(c *check.C) {
@ -238,13 +265,16 @@ func (s *DockerSuite) TestRunOOMExitCode(c *check.C) {
}
}
// "test" should be printed
func (s *DockerSuite) TestRunEchoStdoutWithMemoryLimit(c *check.C) {
func (s *DockerSuite) TestRunWithMemoryLimit(c *check.C) {
testRequires(c, memoryLimitSupport)
out, _, _ := dockerCmdWithStdoutStderr(c, "run", "-m", "32m", "busybox", "echo", "test")
out = strings.Trim(out, "\r\n")
c.Assert(out, checker.Equals, "test", check.Commentf("container should've printed 'test'"))
file := "/sys/fs/cgroup/memory/memory.limit_in_bytes"
stdout, _, _ := dockerCmdWithStdoutStderr(c, "run", "-m", "32M", "--name", "test", "busybox", "cat", file)
c.Assert(strings.TrimSpace(stdout), checker.Equals, "33554432")
out, err := inspectField("test", "HostConfig.Memory")
c.Assert(err, check.IsNil)
c.Assert(out, check.Equals, "33554432")
}
// TestRunWithoutMemoryswapLimit sets memory limit and disables swap
@ -260,7 +290,13 @@ func (s *DockerSuite) TestRunWithoutMemoryswapLimit(c *check.C) {
func (s *DockerSuite) TestRunWithSwappiness(c *check.C) {
testRequires(c, memorySwappinessSupport)
dockerCmd(c, "run", "--memory-swappiness", "0", "busybox", "true")
file := "/sys/fs/cgroup/memory/memory.swappiness"
out, _ := dockerCmd(c, "run", "--memory-swappiness", "0", "--name", "test", "busybox", "cat", file)
c.Assert(strings.TrimSpace(out), checker.Equals, "0")
out, err := inspectField("test", "HostConfig.MemorySwappiness")
c.Assert(err, check.IsNil)
c.Assert(out, check.Equals, "0")
}
func (s *DockerSuite) TestRunWithSwappinessInvalid(c *check.C) {
@ -277,7 +313,14 @@ func (s *DockerSuite) TestRunWithSwappinessInvalid(c *check.C) {
func (s *DockerSuite) TestRunWithMemoryReservation(c *check.C) {
testRequires(c, memoryReservationSupport)
dockerCmd(c, "run", "--memory-reservation", "200M", "busybox", "true")
file := "/sys/fs/cgroup/memory/memory.soft_limit_in_bytes"
out, _ := dockerCmd(c, "run", "--memory-reservation", "200M", "--name", "test", "busybox", "cat", file)
c.Assert(strings.TrimSpace(out), checker.Equals, "209715200")
out, err := inspectField("test", "HostConfig.MemoryReservation")
c.Assert(err, check.IsNil)
c.Assert(out, check.Equals, "209715200")
}
func (s *DockerSuite) TestRunWithMemoryReservationInvalid(c *check.C) {