Browse code
Merge pull request #35365 from Microsoft/jjh/removeduplicateoomscoreadj
Remove duplicate redundant setting of OOMScoreAdj in OCI spec
Justin Cormack authored on 2017/11/03 22:59:51Showing 1 changed files
| ... | ... |
@@ -755,7 +755,6 @@ func (daemon *Daemon) createSpec(c *container.Container) (*specs.Spec, error) {
|
| 755 | 755 |
if err := setResources(&s, c.HostConfig.Resources); err != nil {
|
| 756 | 756 |
return nil, fmt.Errorf("linux runtime spec resources: %v", err)
|
| 757 | 757 |
} |
| 758 |
- s.Process.OOMScoreAdj = &c.HostConfig.OomScoreAdj |
|
| 759 | 758 |
s.Linux.Sysctl = c.HostConfig.Sysctls |
| 760 | 759 |
|
| 761 | 760 |
p := s.Linux.CgroupsPath |