diff options
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/mountmanager/manager.go | 22 |
1 files changed, 12 insertions, 10 deletions
diff --git a/pkg/mountmanager/manager.go b/pkg/mountmanager/manager.go index 7e94b89..e4e4329 100644 --- a/pkg/mountmanager/manager.go +++ b/pkg/mountmanager/manager.go @@ -169,22 +169,24 @@ func ensureTargetClean(targetPath string) error { isMount, err := kubeMounter.IsMountPoint(targetPath) if err != nil { if os.IsNotExist(err) { - return os.MkdirAll(targetPath, 0750) - } - if mount.IsCorruptedMnt(err) { + // Path does not exist, which is a clean state. Directory will be created below. + } else if mount.IsCorruptedMnt(err) { + glog.Warningf("Target path %s is a corrupted mount, attempting to unmount", targetPath) if err := kubeMounter.Unmount(targetPath); err != nil { - return err + return fmt.Errorf("failed to unmount corrupted mount %s: %w", targetPath, err) } - return ensureTargetClean(targetPath) + } else { + return err } - return err - } - if isMount { + } else if isMount { + glog.Infof("Target path %s is an existing mount, attempting to unmount", targetPath) if err := kubeMounter.Unmount(targetPath); err != nil { - return err + return fmt.Errorf("failed to unmount existing mount %s: %w", targetPath, err) } } - return nil + + // Ensure the path exists and is a directory. + return os.MkdirAll(targetPath, 0750) } func validateMountRequest(req *MountRequest) error { |