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

Merge pull request #12287 from calavera/check_memory_swap_when_disabled

Browse Source 
Log memory swap capabilities properly.
Upstream-commit: 3d424ead3baa489380faca50d433a80b91df527e
Component: engine
This commit is contained in:
Michael Crosby
2015-04-13 13:19:52 -07:00
parent c70c4ed8f3 7e81577a52
commit 58a255f72b
1 changed files with 1 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
components/engine/daemon/container.go
+1 -1
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
}