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

Merge pull request #11454 from hqhq/fix_memoryswap_warning

Browse Source 
do not warning when we disable memoryswap
Upstream-commit: b6e20a67f915c8be0b2829742ab32dea3d342905
Component: engine
This commit is contained in:
Jessie Frazelle
2015-03-21 15:23:25 -07:00
parent 7d0cfe4c45 49cb18395f
commit 8a89ab91de
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/create.go
View File

@ -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
}