Merge pull request #11295 from LK4D4/oom_after_dead

Check oom status after container stopped in lxc driver
Upstream-commit: 0c2eb5ebfb118e1fcab84a8eb70dc8aee5a618ad
Component: engine

components/engine/daemon/execdriver/lxc/driver.go

@@ -256,16 +256,16 @@ func (d *driver) Run(c *execdriver.Command, pipes *execdriver.Pipes, startCallba
 
 	oomKill := false
 	oomKillNotification, err := notifyOnOOM(cgroupPaths)
+
+	<-waitLock
+
 	if err == nil {
 		_, oomKill = <-oomKillNotification
 		log.Debugf("oomKill error %s waitErr %s", oomKill, waitErr)
-
 	} else {
 		log.Warnf("Your kernel does not support OOM notifications: %s", err)
 	}
 
-	<-waitLock
-
 	// check oom error
 	exitCode := getExitCode(c)
 	if oomKill {