1. docker
  2. Commit 1e1156cf67233cf8eaee2da9c17465ff0d9c2aa0
Browse code

Skip kernel-memory tests on RHEL/CentOS daemons

RHEL/CentOS 3.10 kernels report that kernel-memory accounting is supported,
but it actually does not work.

Runc (when compiled for those kernels) will be compiled without kernel-memory
support, so even though the daemon may be reporting that it's supported,
it actually is not.

This cause tests to fail when testing against a daemon that's using a runc
version without kmem support.

For now, skip these tests based on the kernel version reported by the daemon.

This should fix failures such as:

```
FAIL: /go/src/github.com/docker/docker/integration-cli/docker_cli_run_unix_test.go:499: DockerSuite.TestRunWithKernelMemory

assertion failed:
Command: /usr/bin/docker run --kernel-memory 50M --name test1 busybox cat /sys/fs/cgroup/memory/memory.kmem.limit_in_bytes
ExitCode: 0
Error: <nil>
Stdout: 9223372036854771712

Stderr: WARNING: You specified a kernel memory limit on a kernel older than 4.0. Kernel memory limits are experimental on older kernels, it won't work as expected and can cause your system to be unstable.

Failures:
Expected stdout to contain "52428800"

FAIL: /go/src/github.com/docker/docker/integration-cli/docker_cli_update_unix_test.go:125: DockerSuite.TestUpdateKernelMemory

/go/src/github.com/docker/docker/integration-cli/docker_cli_update_unix_test.go:136:
...open /go/src/github.com/docker/docker/integration-cli/docker_cli_update_unix_test.go: no such file or directory
... obtained string = "9223372036854771712"
... expected string = "104857600"

----------------------------------------------------------------------
FAIL: /go/src/github.com/docker/docker/integration-cli/docker_cli_update_unix_test.go:139: DockerSuite.TestUpdateKernelMemoryUninitialized

/go/src/github.com/docker/docker/integration-cli/docker_cli_update_unix_test.go:149:
...open /go/src/github.com/docker/docker/integration-cli/docker_cli_update_unix_test.go: no such file or directory
... value = nil
```

Signed-off-by: Sebastiaan van Stijn <github@gone.nl>

Sebastiaan van Stijn authored on 2019/01/04 21:23:36
Showing 3 changed files
integration-cli/docker_cli_run_unix_test.go
History View file @ 1e1156c
... ... 
@@ -497,7 +497,7 @@ func (s *DockerSuite) TestRunWithInvalidCpuPeriod(c *check.C) {
497 497 
 }
498 498
499 499 
 func (s *DockerSuite) TestRunWithKernelMemory(c *check.C) {
500 
-	testRequires(c, kernelMemorySupport)
500 
+	testRequires(c, DaemonIsLinux, kernelMemorySupport)
501 501
502 502 
 	file := "/sys/fs/cgroup/memory/memory.kmem.limit_in_bytes"
503 503 
 	cli.DockerCmd(c, "run", "--kernel-memory", "50M", "--name", "test1", "busybox", "cat", file).Assert(c, icmd.Expected{
... ... 
@@ -510,7 +510,7 @@ func (s *DockerSuite) TestRunWithKernelMemory(c *check.C) {
510 510 
 }
511 511
512 512 
 func (s *DockerSuite) TestRunWithInvalidKernelMemory(c *check.C) {
513 
-	testRequires(c, kernelMemorySupport)
513 
+	testRequires(c, DaemonIsLinux, kernelMemorySupport)
514 514
515 515 
 	out, _, err := dockerCmdWithError("run", "--kernel-memory", "2M", "busybox", "true")
516 516 
 	c.Assert(err, check.NotNil)
integration-cli/requirements_unix_test.go
History View file @ 1e1156c
... ... 
@@ -38,6 +38,17 @@ func pidsLimit() bool {
38 38 
 }
39 39
40 40 
 func kernelMemorySupport() bool {
41 
+	// TODO remove this once kmem support in RHEL kernels is fixed. See https://github.com/opencontainers/runc/pull/1921
42 
+	daemonV, err := kernel.ParseRelease(testEnv.DaemonInfo.KernelVersion)
43 
+	if err != nil {
44 
+		return false
45 
+	}
46 
+	requiredV := kernel.VersionInfo{Kernel: 3, Major: 10}
47 
+	if kernel.CompareKernelVersion(*daemonV, requiredV) < 1 {
48 
+		// On Kernel 3.10 and under, don't consider kernel memory to be supported,
49 
+		// even if the kernel (and thus the daemon) reports it as being supported
50 
+		return false
51 
+	}
41 52 
 	return testEnv.DaemonInfo.KernelMemory
42 53 
 }
43 54
pkg/parsers/kernel/kernel_unix_test.go
History View file @ 1e1156c
... ... 
@@ -27,6 +27,7 @@ func TestParseRelease(t *testing.T) {
27 27 
 	assertParseRelease(t, "3.4.54.longterm-1", &VersionInfo{Kernel: 3, Major: 4, Minor: 54, Flavor: ".longterm-1"}, 0)
28 28 
 	assertParseRelease(t, "3.4.54.longterm-1", &VersionInfo{Kernel: 3, Major: 4, Minor: 54, Flavor: ".longterm-1"}, 0)
29 29 
 	assertParseRelease(t, "3.8.0-19-generic", &VersionInfo{Kernel: 3, Major: 8, Minor: 0, Flavor: "-19-generic"}, 0)
30 
+	assertParseRelease(t, "3.10.0-862.2.3.el7.x86_64", &VersionInfo{Kernel: 3, Major: 10, Minor: 0, Flavor: "-862.2.3.el7.x86_64"}, 0)
30 31 
 	assertParseRelease(t, "3.12.8tag", &VersionInfo{Kernel: 3, Major: 12, Minor: 8, Flavor: "tag"}, 0)
31 32 
 	assertParseRelease(t, "3.12-1-amd64", &VersionInfo{Kernel: 3, Major: 12, Minor: 0, Flavor: "-1-amd64"}, 0)
32 33 
 	assertParseRelease(t, "3.8.0", &VersionInfo{Kernel: 4, Major: 8, Minor: 0}, -1)