From 9508b2bf12e29a8fe0dc2e702a39149fdac47f9a Mon Sep 17 00:00:00 2001 From: chakri Date: Wed, 4 Feb 2015 01:46:28 +0000 Subject: [PATCH] Fix orphaned pod & volume cleanup order. Volumes need to be unmounted before pod cleanup. --- pkg/kubelet/kubelet.go | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/pkg/kubelet/kubelet.go b/pkg/kubelet/kubelet.go index bd3cd98f46b..a8ae27f697b 100644 --- a/pkg/kubelet/kubelet.go +++ b/pkg/kubelet/kubelet.go @@ -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 }