p4u1/docker-cli
0
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Log memory swap capabilities properly.

Browse Source 
Check whether the swap limit capabilities are disabled or not only when memory swap is set to greater than 0.

Signed-off-by: David Calavera <david.calavera@gmail.com>
Upstream-commit: 7523beff41eca212794e902afa1a614b2672e245
Component: engine
This commit is contained in:
David Calavera
2015-04-10 17:07:05 -07:00
parent 9c2d3bf645
commit 7e81577a52
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
components/engine/daemon/container.go
View File

@ -1286,7 +1286,7 @@ func (container *Container) verifyDaemonSettings() {
logrus.Warnf("Your kernel does not support memory limit capabilities. Limitation discarded.")
container.hostConfig.Memory = 0
}
if container.hostConfig.Memory > 0 && !container.daemon.sysInfo.SwapLimit {
if container.hostConfig.Memory > 0 && container.hostConfig.MemorySwap != -1 && !container.daemon.sysInfo.SwapLimit {
logrus.Warnf("Your kernel does not support swap limit capabilities. Limitation discarded.")
container.hostConfig.MemorySwap = -1
}