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

Merge pull request #4093 from nelcy/master

Browse Source 
Fix orphaned pod & volume cleanup order. Volumes need to be unmounted before pod cleanup.
This commit is contained in:
Brendan Burns
2015-02-04 14:38:20 -08:00
parent e6e67e2662 9508b2bf12
commit 6e897524be
1 changed files with 4 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
pkg/kubelet/kubelet.go
View File

@@ -1274,14 +1274,14 @@ func (kl *Kubelet) SyncPods(pods []api.BoundPod) error {
} }
} }
// Remove any orphaned pods. // Remove any orphaned volumes.
err = kl.cleanupOrphanedPods(pods) err = kl.cleanupOrphanedVolumes(pods)
if err != nil { if err != nil {
return err return err
} }
// Remove any orphaned volumes. // Remove any orphaned pods.
err = kl.cleanupOrphanedVolumes(pods) err = kl.cleanupOrphanedPods(pods)
if err != nil { if err != nil {
return err return err
} }