From 49cb18395f505851a6d1d36a04c62c1cef865569 Mon Sep 17 00:00:00 2001 From: Qiang Huang Date: Wed, 18 Mar 2015 10:08:17 +0800 Subject: [PATCH] do not warning when we disable memoryswap $ docker run -ti --rm -m 300M --memory-swap=-1 ubuntu:14.04 WARNING: Your kernel does not support swap limit capabilities. Limitation discarded. root@813aafc019d5:/# When we disable memoryswap, it should not warning swap limit not support. Signed-off-by: Qiang Huang Upstream-commit: 55cc166e53498a844cd5e96841a25ba1d19924ae Component: engine --- components/engine/daemon/create.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/components/engine/daemon/create.go b/components/engine/daemon/create.go index e17b63636b..49bc6a7de9 100644 --- a/components/engine/daemon/create.go +++ b/components/engine/daemon/create.go @@ -33,7 +33,7 @@ func (daemon *Daemon) ContainerCreate(job *engine.Job) engine.Status { job.Errorf("Your kernel does not support memory limit capabilities. Limitation discarded.\n") hostConfig.Memory = 0 } - if hostConfig.Memory > 0 && !daemon.SystemConfig().SwapLimit { + if hostConfig.Memory > 0 && hostConfig.MemorySwap != -1 && !daemon.SystemConfig().SwapLimit { job.Errorf("Your kernel does not support swap limit capabilities. Limitation discarded.\n") hostConfig.MemorySwap = -1 }