From f1b7621f42b3a773bf23ef386445571be44a5669 Mon Sep 17 00:00:00 2001 From: Derek Carr Date: Fri, 17 Feb 2017 02:24:46 -0500 Subject: [PATCH] kubelet volumes cleanupOrphanedPodDirs does not distinguish error from found volume paths --- pkg/kubelet/kubelet_volumes.go | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/pkg/kubelet/kubelet_volumes.go b/pkg/kubelet/kubelet_volumes.go index a2649e41f0f..5b8c3146a7f 100644 --- a/pkg/kubelet/kubelet_volumes.go +++ b/pkg/kubelet/kubelet_volumes.go @@ -106,8 +106,12 @@ func (kl *Kubelet) cleanupOrphanedPodDirs( } // If there are still volume directories, do not delete directory volumePaths, err := kl.getPodVolumePathListFromDisk(uid) - if err != nil || len(volumePaths) > 0 { - glog.Errorf("Orphaned pod %q found, but error %v occured during reading volume dir from disk", uid, err) + if err != nil { + glog.Errorf("Orphaned pod %q found, but error %v occurred during reading volume dir from disk", uid, err) + continue + } + if len(volumePaths) > 0 { + glog.Errorf("Orphaned pod %q found, but volume paths are still present on disk.", uid) continue } glog.V(3).Infof("Orphaned pod %q found, removing", uid)