From a90d47da60e1698233e059a5f8c797fff74ff8fc Mon Sep 17 00:00:00 2001 From: Dawn Chen Date: Fri, 5 Jun 2015 18:12:05 -0700 Subject: [PATCH] Passing memory swap limit -1 by default. Docker remote API never check if memory swap is enabled by kernel or not, instead by default to set the limit to memory * 2, and return API error 500 if swap is not enabled. (cherry picked from commit f714020a7a04621270480f773f7bee3d4d02cb47) --- pkg/kubelet/dockertools/manager.go | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/dockertools/manager.go b/pkg/kubelet/dockertools/manager.go index 5ce43aded11..9b3a11e4edd 100644 --- a/pkg/kubelet/dockertools/manager.go +++ b/pkg/kubelet/dockertools/manager.go @@ -584,6 +584,7 @@ func (dm *DockerManager) runContainer( Image: container.Image, // Memory and CPU are set here for older versions of Docker (pre-1.6). Memory: memoryLimit, + MemorySwap: -1, CPUShares: cpuShares, WorkingDir: container.WorkingDir, Labels: labels, @@ -634,8 +635,9 @@ func (dm *DockerManager) runContainer( NetworkMode: netMode, IpcMode: ipcMode, // Memory and CPU are set here for newer versions of Docker (1.6+). - Memory: memoryLimit, - CPUShares: cpuShares, + Memory: memoryLimit, + MemorySwap: -1, + CPUShares: cpuShares, } if len(opts.DNS) > 0 { hc.DNS = opts.DNS