mkdir mountpath before createOrAddRef (#1302)

Signed-off-by: zwwhdls <[email protected]>

Author: zwwhdls

pkg/controller/pod_driver.go

@@ -1050,17 +1050,7 @@ func mkrMp(ctx context.Context, pod corev1.Pod) error {
 		log.Error(err, "get mount point error")
 		return err
 	}
-	err = util.DoWithTimeout(ctx, 3*time.Second, func() error {
-		exist := util.Exists(mntPath)
-		if !exist {
-			return os.MkdirAll(mntPath, 0777)
-		}
-		return nil
-	})
-	if err != nil {
-		return err
-	}
-	return nil
+	return util.MkdirIfNotExist(ctx, mntPath)
 }
 
 func (p *PodDriver) getAvailableMountPod(uniqueId, upgradeUUID string) bool {

pkg/juicefs/mount/pod_mount.go

@@ -19,7 +19,6 @@ package mount
 import (
 	"context"
 	"fmt"
-	"os"
 	"os/exec"
 	"regexp"
 	"strings"
@@ -361,14 +360,7 @@ func (p *PodMount) createOrAddRef(ctx context.Context, podName string, jfsSettin
 		} else if err != nil {
 			if k8serrors.IsNotFound(err) {
 				// mkdir mountpath
-				err = util.DoWithTimeout(ctx, 3*time.Second, func() error {
-					exist, _ := k8sMount.PathExists(jfsSetting.MountPath)
-					if !exist {
-						return os.MkdirAll(jfsSetting.MountPath, 0777)
-					}
-					return nil
-				})
-				if err != nil {
+				if err = util.MkdirIfNotExist(ctx, jfsSetting.MountPath); err != nil {
 					return
 				}
 				// pod not exist, create
@@ -435,6 +427,11 @@ func (p *PodMount) createOrAddRef(ctx context.Context, podName string, jfsSettin
 			log.Error(err, "Get mount path of pod error", "podName", podName)
 			return err
 		}
+
+		// mkdir mountpath
+		if err = util.MkdirIfNotExist(ctx, jfsSetting.MountPath); err != nil {
+			return
+		}
 		return p.AddRefOfMount(ctx, jfsSetting.TargetPath, podName)
 	}
 }

pkg/util/util.go

@@ -508,6 +508,16 @@ func Exists(path string) bool {
 	return err == nil || !os.IsNotExist(err) //skip mutate
 }
 
+func MkdirIfNotExist(ctx context.Context, mntPath string) (err error) {
+	return DoWithTimeout(ctx, 3*time.Second, func() error {
+		exist := Exists(mntPath)
+		if !exist {
+			return os.MkdirAll(mntPath, 0777)
+		}
+		return nil
+	})
+}
+
 type ClientVersion struct {
 	IsCe  bool
 	Dev   bool