From 8774f6efa28a13ffa22b80abf7bdfd448f43381a Mon Sep 17 00:00:00 2001
From: Yu-Ju Hong <yjhong@google.com>
Date: Thu, 27 Aug 2015 22:17:57 -0700
Subject: [PATCH] kubelet: don't remove any pod directory with non-empty
 volumes

If the volumes directory is not empty, it implies that volumes may not have
been properly cleaned up yet. Do not attempt to remove the pod directory.
---
 pkg/kubelet/kubelet.go | 20 ++++++++++++++------
 1 file changed, 14 insertions(+), 6 deletions(-)

diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go
index a37eec7fb46..e6b63cc7082 100644
--- a/pkg/kubelet/kubelet.go
+++ b/pkg/kubelet/kubelet.go
@@ -1350,12 +1350,20 @@ func (kl *Kubelet) cleanupOrphanedPodDirs(pods []*api.Pod, runningPods []*kubeco
 		return err
 	}
 	errlist := []error{}
-	for i := range found {
-		if !active.Has(string(found[i])) {
-			glog.V(3).Infof("Orphaned pod %q found, removing", found[i])
-			if err := os.RemoveAll(kl.getPodDir(found[i])); err != nil {
-				errlist = append(errlist, err)
-			}
+	for _, uid := range found {
+		if active.Has(string(uid)) {
+			continue
+		}
+		if err := os.Remove(kl.getPodVolumesDir(uid)); err != nil {
+			// If we cannot remove the volumes directory, it implies that the
+			// the directory is not empty. We should wait for the volume
+			// cleanup to complete before attempting to delete the directory.
+			glog.V(3).Infof("Orphaned pod %q found, but unable to remove the volume directory", uid)
+			continue
+		}
+		glog.V(3).Infof("Orphaned pod %q found, removing", uid)
+		if err := os.RemoveAll(kl.getPodDir(uid)); err != nil {
+			errlist = append(errlist, err)
 		}
 	}
 	return utilErrors.NewAggregate(errlist)