From ff62b6653f2ba858a9ef9623a90ee20f20c69d75 Mon Sep 17 00:00:00 2001
From: chrislusf <chris.lu@gmail.com>
Date: Fri, 5 Dec 2025 18:51:43 -0800
Subject: fix: improve ensureTargetClean to be non-recursive and always ensure
 directory exists

Address review feedback from gemini-code-assist:
- Replace recursive approach with non-recursive to avoid potential stack overflow
- Always call os.MkdirAll at the end to ensure directory exists after unmount
- Add better error messages with context
- Add logging for unmount operations
---
 pkg/mountmanager/manager.go | 22 ++++++++++++----------
 1 file changed, 12 insertions(+), 10 deletions(-)

(limited to 'pkg/mountmanager')

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 {
-- 
cgit v1.2.3