docker
/
docs
mirror of https://github.com/docker/docs.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #19281 from hqhq/hq_dont_fail_oomkilldisable 

Do not fail if not support OomKillDisable
This commit is contained in:
Phil Estes 2016-01-12 21:54:38 -08:00
parent 47d87d3b92 7b616d4743
commit 9232c09cd5
1 changed files with 2 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
daemon/daemon_unix.go
View File

@ -275,8 +275,9 @@ func verifyContainerResources(resources *containertypes.Resources) ([]string, er
logrus.Warnf("You specified a kernel memory limit on a kernel older than 4.0. Kernel memory limits are experimental on older kernels, it won't work as expected and can cause your system to be unstable.") logrus.Warnf("You specified a kernel memory limit on a kernel older than 4.0. Kernel memory limits are experimental on older kernels, it won't work as expected and can cause your system to be unstable.")
} }
if resources.OomKillDisable != nil && !sysInfo.OomKillDisable { if resources.OomKillDisable != nil && !sysInfo.OomKillDisable {
warnings = append(warnings, "Your kernel does not support OomKillDisable, OomKillDisable discarded.")
logrus.Warnf("Your kernel does not support OomKillDisable, OomKillDisable discarded.")
resources.OomKillDisable = nil resources.OomKillDisable = nil
return warnings, fmt.Errorf("Your kernel does not support oom kill disable.")
} }
// cpu subsystem checks and adjustments // cpu subsystem checks and adjustments