From 242504f367f9c0976cdd7f5ba7af4483ffea9469 Mon Sep 17 00:00:00 2001 From: John Howard Date: Wed, 1 Nov 2017 11:01:43 -0700 Subject: [PATCH] Remove dupl setting of OOMScoreAdj in OCI spec Signed-off-by: John Howard Upstream-commit: f0b44881b5d43b18871dee2ecc2bb313046038f6 Component: engine --- components/engine/daemon/oci_linux.go | 1 - 1 file changed, 1 deletion(-) diff --git a/components/engine/daemon/oci_linux.go b/components/engine/daemon/oci_linux.go index b4a6bf60d2..4af14cbd9b 100644 --- a/components/engine/daemon/oci_linux.go +++ b/components/engine/daemon/oci_linux.go @@ -755,7 +755,6 @@ func (daemon *Daemon) createSpec(c *container.Container) (*specs.Spec, error) { if err := setResources(&s, c.HostConfig.Resources); err != nil { return nil, fmt.Errorf("linux runtime spec resources: %v", err) } - s.Process.OOMScoreAdj = &c.HostConfig.OomScoreAdj s.Linux.Sysctl = c.HostConfig.Sysctls p := s.Linux.CgroupsPath