Skip to content
This repository was archived by the owner on Feb 8, 2021. It is now read-only.

Omit error if dir invalid #157

Merged
merged 1 commit into from
Dec 5, 2016
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 6 additions & 0 deletions pkg/volume/cinder/cinder.go
Original file line number Diff line number Diff line change
Expand Up @@ -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)
Expand Down