Skip KernelMemoryTCP if version is less than 1.40

yongtang · yongtang · commit ee74cd777a94 · 2018-11-26T21:04:27.000Z
Signed-off-by: Yong Tang &lt;yong.tang.github@outlook.com&gt;
diff --git a/api/server/router/container/container_routes.go b/api/server/router/container/container_routes.go
@@ -475,6 +475,12 @@ func (s *containerRouter) postContainersCreate(ctx context.Context, w http.Respo
 		}
 	}
 
+	// When using API 1.39 and under, KernelMemoryTCP should be ignored because it
+	// was added in API 1.40.
+	if hostConfig != nil && versions.LessThan(version, "1.40") {
+		hostConfig.KernelMemoryTCP = 0
+	}
+
 	ccr, err := s.backend.ContainerCreate(types.ContainerCreateConfig{
 		Name:             name,
 		Config:           config,
diff --git a/integration/container/run_linux_test.go b/integration/container/run_linux_test.go
@@ -8,6 +8,7 @@ import (
 	"time"
 
 	containertypes "github.com/docker/docker/api/types/container"
+	"github.com/docker/docker/api/types/versions"
 	"github.com/docker/docker/integration/internal/container"
 	"github.com/docker/docker/internal/test/request"
 	"gotest.tools/assert"
@@ -18,6 +19,7 @@ import (
 
 func TestKernelTCPMemory(t *testing.T) {
 	skip.If(t, testEnv.DaemonInfo.OSType != "linux")
+	skip.If(t, versions.LessThan(testEnv.DaemonAPIVersion(), "1.40"), "skip test from new feature")
 	skip.If(t, !testEnv.DaemonInfo.KernelMemoryTCP)
 
 	defer setupTest(t)()

Original file line number	Diff line number	Diff line change
`@@ -475,6 +475,12 @@ func (s *containerRouter) postContainersCreate(ctx context.Context, w http.Respo`
`475`	`475`	`}`
`476`	`476`	`}`
`477`	`477`
	`478`	`+ // When using API 1.39 and under, KernelMemoryTCP should be ignored because it`
	`479`	`+ // was added in API 1.40.`
	`480`	`+ if hostConfig != nil && versions.LessThan(version, "1.40") {`
	`481`	`+ hostConfig.KernelMemoryTCP = 0`
	`482`	`+ }`
	`483`	`+`
`478`	`484`	`ccr, err := s.backend.ContainerCreate(types.ContainerCreateConfig{`
`479`	`485`	`Name: name,`
`480`	`486`	`Config: config,`