From e2eccddc6fe102ab54f861611aff239d105ff01b Mon Sep 17 00:00:00 2001
From: Xiaogang Xin <xnxin@ebay.com>
Date: Mon, 7 Mar 2016 13:42:41 +0800
Subject: [PATCH] kubernetes/kubernetes#22625 Fix issue of out-of-date
 `Terminating` mirror pod status - During `kubelet` `syncPod`, check mirror
 pod `DeletionTimestamp` value to determine whether re-create mirror pod for
 running static pod.

---
 pkg/kubelet/kubelet.go | 18 ++++++++++--------
 1 file changed, 10 insertions(+), 8 deletions(-)

diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index f68f4549817..3bf944d43cc 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -1738,14 +1738,16 @@ func (kl *Kubelet) syncPod(pod *api.Pod, mirrorPod *api.Pod, podStatus *kubecont
 	if kubepod.IsStaticPod(pod) {
 		podFullName := kubecontainer.GetPodFullName(pod)
 		deleted := false
-		if mirrorPod != nil && !kl.podManager.IsMirrorPodOf(mirrorPod, pod) {
-			// The mirror pod is semantically different from the static pod. Remove
-			// it. The mirror pod will get recreated later.
-			glog.Errorf("Deleting mirror pod %q because it is outdated", format.Pod(mirrorPod))
-			if err := kl.podManager.DeleteMirrorPod(podFullName); err != nil {
-				glog.Errorf("Failed deleting mirror pod %q: %v", format.Pod(mirrorPod), err)
-			} else {
-				deleted = true
+		if mirrorPod != nil {
+			if mirrorPod.DeletionTimestamp != nil || !kl.podManager.IsMirrorPodOf(mirrorPod, pod) {
+				// The mirror pod is semantically different from the static pod. Remove
+				// it. The mirror pod will get recreated later.
+				glog.Errorf("Deleting mirror pod %q because it is outdated", format.Pod(mirrorPod))
+				if err := kl.podManager.DeleteMirrorPod(podFullName); err != nil {
+					glog.Errorf("Failed deleting mirror pod %q: %v", format.Pod(mirrorPod), err)
+				} else {
+					deleted = true
+				}
 			}
 		}
 		if mirrorPod == nil || deleted {