kotovalexarian-likes-github/moby--moby
1
0
Fork 0
mirror of https://github.com/moby/moby.git synced 2022-11-09 12:21:53 -05:00
Code Releases Activity

Merge pull request #35365 from Microsoft/jjh/removeduplicateoomscoreadj

Browse source 
Remove duplicate redundant setting of OOMScoreAdj in OCI spec
This commit is contained in:
Justin Cormack 2017-11-03 13:59:51 +00:00 • committed by GitHub
commit f5c70c5b75
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 0 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

1
daemon/oci_linux.go
View file

@ -755,7 +755,6 @@ func (daemon *Daemon) createSpec(c *container.Container) (*specs.Spec, error) {
if err := setResources(&s, c.HostConfig.Resources); err != nil { if err := setResources(&s, c.HostConfig.Resources); err != nil {
return nil, fmt.Errorf("linux runtime spec resources: %v", err) return nil, fmt.Errorf("linux runtime spec resources: %v", err)
} }
s.Process.OOMScoreAdj = &c.HostConfig.OomScoreAdj
s.Linux.Sysctl = c.HostConfig.Sysctls s.Linux.Sysctl = c.HostConfig.Sysctls
p := s.Linux.CgroupsPath p := s.Linux.CgroupsPath