github/kubernetes
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

kubelet: don't remove any pod directory with non-empty volumes

Browse Source 
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.
This commit is contained in:
Yu-Ju Hong
2015-08-27 22:17:57 -07:00
parent 35d05093f7
commit 8774f6efa2
1 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files

18
pkg/kubelet/kubelet.go
View File

@@ -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)