From a2f39e7754c5ca1245cc268472ecb92147ba21fa Mon Sep 17 00:00:00 2001 From: Qiang Huang Date: Sun, 10 May 2015 14:55:00 +0800 Subject: [PATCH] Fix oom kill disable issue It should not be hard limit, we should only check oom kill disable when user using it. Signed-off-by: Qiang Huang --- daemon/create.go | 5 ----- daemon/daemon.go | 4 ++++ 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/daemon/create.go b/daemon/create.go index 8cd3030c2a..d8addd3a99 100644 --- a/daemon/create.go +++ b/daemon/create.go @@ -24,11 +24,6 @@ func (daemon *Daemon) ContainerCreate(name string, config *runconfig.Config, hos return "", warnings, fmt.Errorf("The working directory '%s' is invalid. It needs to be an absolute path.", config.WorkingDir) } - if !daemon.SystemConfig().OomKillDisable { - hostConfig.OomKillDisable = false - return "", warnings, fmt.Errorf("Your kernel does not support oom kill disable.") - } - container, buildWarnings, err := daemon.Create(config, hostConfig, name) if err != nil { if daemon.Graph().IsNotExist(err, config.Image) { diff --git a/daemon/daemon.go b/daemon/daemon.go index b82dd42a99..6b22ae8827 100644 --- a/daemon/daemon.go +++ b/daemon/daemon.go @@ -1181,6 +1181,10 @@ func (daemon *Daemon) verifyHostConfig(hostConfig *runconfig.HostConfig) ([]stri if hostConfig.BlkioWeight > 0 && (hostConfig.BlkioWeight < 10 || hostConfig.BlkioWeight > 1000) { return warnings, fmt.Errorf("Range of blkio weight is from 10 to 1000.") } + if hostConfig.OomKillDisable && !daemon.SystemConfig().OomKillDisable { + hostConfig.OomKillDisable = false + return warnings, fmt.Errorf("Your kernel does not support oom kill disable.") + } return warnings, nil }