diff --git a/pkg/volume/aws_pd/aws_pd.go b/pkg/volume/aws_pd/aws_pd.go index 2fb760c0904..0c7f5bd0681 100644 --- a/pkg/volume/aws_pd/aws_pd.go +++ b/pkg/volume/aws_pd/aws_pd.go @@ -254,18 +254,22 @@ func (pd *awsPersistentDisk) TearDown() error { func (pd *awsPersistentDisk) TearDownAt(dir string) error { mountpoint, err := mount.IsMountPoint(dir) if err != nil { + glog.V(2).Info("Error checking if mountpoint ", dir, ": ", err) return err } if !mountpoint { + glog.V(2).Info("Not mountpoint, deleting") return os.Remove(dir) } refs, err := mount.GetMountRefs(pd.mounter, dir) if err != nil { + glog.V(2).Info("Error getting mountrefs for ", dir, ": ", err) return err } // Unmount the bind-mount inside this pod if err := pd.mounter.Unmount(dir, 0); err != nil { + glog.V(2).Info("Error unmounting dir ", dir, ": ", err) return err } // If len(refs) is 1, then all bind mounts have been removed, and the @@ -274,6 +278,7 @@ func (pd *awsPersistentDisk) TearDownAt(dir string) error { // pd.pdName is not initially set for volume-cleaners, so set it here. pd.pdName = path.Base(refs[0]) if err := pd.manager.DetachDisk(pd); err != nil { + glog.V(2).Info("Error detaching disk ", pd.pdName, ": ", err) return err } } @@ -284,6 +289,7 @@ func (pd *awsPersistentDisk) TearDownAt(dir string) error { } if !mountpoint { if err := os.Remove(dir); err != nil { + glog.V(2).Info("Error removing mountpoint ", dir, ": ", err) return err } } diff --git a/pkg/volume/aws_pd/aws_util.go b/pkg/volume/aws_pd/aws_util.go index c69157ff9b7..a6b9c33e258 100644 --- a/pkg/volume/aws_pd/aws_util.go +++ b/pkg/volume/aws_pd/aws_util.go @@ -91,17 +91,21 @@ func (util *AWSDiskUtil) DetachDisk(pd *awsPersistentDisk) error { // Unmount the global PD mount, which should be the only one. globalPDPath := makeGlobalPDName(pd.plugin.host, pd.pdName) if err := pd.mounter.Unmount(globalPDPath, 0); err != nil { + glog.V(2).Info("Error unmount dir ", globalPDPath, ": ", err) return err } if err := os.Remove(globalPDPath); err != nil { + glog.V(2).Info("Error removing dir ", globalPDPath, ": ", err) return err } // Detach the disk volumes, err := pd.getVolumeProvider() if err != nil { + glog.V(2).Info("Error getting volume provider for pd ", pd.pdName, ": ", err) return err } if err := volumes.DetachDisk("", pd.pdName); err != nil { + glog.V(2).Info("Error detaching disk ", pd.pdName, ": ", err) return err } return nil