Fix orphaned pod & volume cleanup order. Volumes need to be unmounted before pod cleanup.

This commit is contained in:
chakri 2015-02-04 01:46:28 +00:00
parent 72ad4f12bd
commit 9508b2bf12

View File

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