From ecc13c8d86ad2c869d5539ace1ed37ab83892caf Mon Sep 17 00:00:00 2001 From: ohmystack Date: Tue, 6 Feb 2018 16:05:24 +0800 Subject: [PATCH] dockertools: disable MemorySwap on Linux According to docker docs, setting MemorySwap equals to Memory can prevent docker containers from using any swap, instead of setting MemorySwap to zero. --- pkg/kubelet/dockershim/helpers_linux.go | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/pkg/kubelet/dockershim/helpers_linux.go b/pkg/kubelet/dockershim/helpers_linux.go index 431150c31d9..5aa4f93aed0 100644 --- a/pkg/kubelet/dockershim/helpers_linux.go +++ b/pkg/kubelet/dockershim/helpers_linux.go @@ -104,8 +104,9 @@ func (ds *dockerService) updateCreateConfig( rOpts := lc.GetResources() if rOpts != nil { createConfig.HostConfig.Resources = dockercontainer.Resources{ + // Memory and MemorySwap are set to the same value, this prevents containers from using any swap. Memory: rOpts.MemoryLimitInBytes, - MemorySwap: DefaultMemorySwap(), + MemorySwap: rOpts.MemoryLimitInBytes, CPUShares: rOpts.CpuShares, CPUQuota: rOpts.CpuQuota, CPUPeriod: rOpts.CpuPeriod,