From d52c045321199a393c6a17bd75c5635a667cc4a1 Mon Sep 17 00:00:00 2001 From: Harry Zhang Date: Mon, 5 Dec 2016 14:25:14 +0800 Subject: [PATCH] Omit error if dir invalid --- pkg/volume/cinder/cinder.go | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/pkg/volume/cinder/cinder.go b/pkg/volume/cinder/cinder.go index f19954d743ab..2a9eba088569 100644 --- a/pkg/volume/cinder/cinder.go +++ b/pkg/volume/cinder/cinder.go @@ -419,6 +419,12 @@ func (c *cinderVolumeUnmounter) TearDown() error { func (c *cinderVolumeUnmounter) TearDownAt(dir string) error { glog.V(5).Infof("Cinder TearDown of %s", dir) + if _, err := os.Stat(dir); os.IsNotExist(err) { + // non-exist dir for TearDown is meaningless and it is possible that this dir has been cleaned up, just omit the error for now + glog.Warningf("Volume directory: %v does not exists, it may have been cleaned up by previous tear down task", dir) + return nil + } + notmnt, err := c.mounter.IsLikelyNotMountPoint(dir) if err != nil { glog.V(4).Infof("IsLikelyNotMountPoint check failed: %v", err)