From e3e1c7a6a1c590af8b97b1b53601140808ca6ed8 Mon Sep 17 00:00:00 2001
From: Yu-Ju Hong <yjhong@google.com>
Date: Thu, 19 May 2016 11:32:36 -0700
Subject: [PATCH 1/2] kubelet: Don't attempt to apply the oom score if the
 container is not running

Containers could terminate before kubelet applies the oom score. This is normal
and the function should not error out.
---
 pkg/kubelet/dockertools/manager.go | 20 +++++++++++++++++---
 1 file changed, 17 insertions(+), 3 deletions(-)

diff --git a/pkg/kubelet/dockertools/manager.go b/pkg/kubelet/dockertools/manager.go
index 10ac9e281f3..9da26e6b7b0 100644
--- a/pkg/kubelet/dockertools/manager.go
+++ b/pkg/kubelet/dockertools/manager.go
@@ -1494,14 +1494,28 @@ func (dm *DockerManager) runContainerInPod(pod *api.Pod, container *api.Containe
 	if err != nil {
 		return kubecontainer.ContainerID{}, fmt.Errorf("InspectContainer: %v", err)
 	}
+
+	if !containerInfo.State.Running {
+		if container.Name == PodInfraContainerName {
+			// If the infra container exited prematurely, return an error to raise
+			// awareness.
+			return id, fmt.Errorf("Infra container %q exited prematruely", id)
+		}
+		// For a user container, simply returns since we cannot apply oom score
+		// anymore.
+		glog.V(4).Info("Container %q already exited", containerInfo.ID)
+		return id, nil
+	}
+
 	// Ensure the PID actually exists, else we'll move ourselves.
+	// TODO: Should we simply log the error (or send an event) and move on? We
+	// don't check the oom score in the next sync and correct it anyway.
 	if containerInfo.State.Pid == 0 {
 		return kubecontainer.ContainerID{}, fmt.Errorf("can't get init PID for container %q", id)
 	}
-
 	// Check if current docker version is higher than 1.10. Otherwise, we have to apply OOMScoreAdj instead of using docker API.
-	err = dm.applyOOMScoreAdjIfNeeded(container, containerInfo)
-	if err != nil {
+	// TODO: Remove this logic after we stop supporting docker version < 1.10.
+	if err := dm.applyOOMScoreAdjIfNeeded(container, containerInfo); err != nil {
 		return kubecontainer.ContainerID{}, err
 	}
 

From b57fbee557a5c006c30e24bd851c4f2583b4ecb7 Mon Sep 17 00:00:00 2001
From: Yu-Ju Hong <yjhong@google.com>
Date: Thu, 19 May 2016 12:21:27 -0700
Subject: [PATCH 2/2] check pid in oomscoreadj

---
 pkg/kubelet/dockertools/manager.go | 24 ++++++------------------
 1 file changed, 6 insertions(+), 18 deletions(-)

diff --git a/pkg/kubelet/dockertools/manager.go b/pkg/kubelet/dockertools/manager.go
index 9da26e6b7b0..670ab995f55 100644
--- a/pkg/kubelet/dockertools/manager.go
+++ b/pkg/kubelet/dockertools/manager.go
@@ -1413,6 +1413,12 @@ func containerAndPodFromLabels(inspect *dockertypes.ContainerJSON) (pod *api.Pod
 }
 
 func (dm *DockerManager) applyOOMScoreAdj(container *api.Container, containerInfo *dockertypes.ContainerJSON) error {
+	if containerInfo.State.Pid == 0 {
+		// Container exited. We cannot do anything about it. Ignore this error.
+		glog.V(2).Infof("Failed to apply OOM score adj on container %q with ID %q. Init process does not exist.", containerInfo.Name, containerInfo.ID)
+		return nil
+	}
+
 	cgroupName, err := dm.procFs.GetFullContainerName(containerInfo.State.Pid)
 	if err != nil {
 		if err == os.ErrNotExist {
@@ -1495,24 +1501,6 @@ func (dm *DockerManager) runContainerInPod(pod *api.Pod, container *api.Containe
 		return kubecontainer.ContainerID{}, fmt.Errorf("InspectContainer: %v", err)
 	}
 
-	if !containerInfo.State.Running {
-		if container.Name == PodInfraContainerName {
-			// If the infra container exited prematurely, return an error to raise
-			// awareness.
-			return id, fmt.Errorf("Infra container %q exited prematruely", id)
-		}
-		// For a user container, simply returns since we cannot apply oom score
-		// anymore.
-		glog.V(4).Info("Container %q already exited", containerInfo.ID)
-		return id, nil
-	}
-
-	// Ensure the PID actually exists, else we'll move ourselves.
-	// TODO: Should we simply log the error (or send an event) and move on? We
-	// don't check the oom score in the next sync and correct it anyway.
-	if containerInfo.State.Pid == 0 {
-		return kubecontainer.ContainerID{}, fmt.Errorf("can't get init PID for container %q", id)
-	}
 	// Check if current docker version is higher than 1.10. Otherwise, we have to apply OOMScoreAdj instead of using docker API.
 	// TODO: Remove this logic after we stop supporting docker version < 1.10.
 	if err := dm.applyOOMScoreAdjIfNeeded(container, containerInfo); err != nil {