fix umount hang and ignore fuse fd if get fd error

Signed-off-by: zwwhdls <[email protected]>
juicedata · Sep 24, 2024 · 7ce0dc7 · 7ce0dc7
1 parent 1fd19d3
commit 7ce0dc7
Show file tree

Hide file tree

Showing 4 changed files with 21 additions and 5 deletions.
diff --git a/pkg/controller/mountinfo.go b/pkg/controller/mountinfo.go
@@ -225,6 +225,7 @@ func (ti *targetItem) check(ctx context.Context, mounted bool) {
 
 		if err.Error() == "function timeout" {
 			ti.status = targetStatusCorrupt
+			return
 		}
 		corrupted := k8sMount.IsCorruptedMnt(err)
 		if corrupted {

diff --git a/pkg/controller/pod_driver.go b/pkg/controller/pod_driver.go
@@ -423,7 +423,10 @@ func (p *PodDriver) podDeletedHandler(ctx context.Context, pod *corev1.Pod) (Res
 
 	if len(existTargets) == 0 {
 		// do not need to create new one, umount
-		util.UmountPath(ctx, sourcePath)
+		_ = util.DoWithTimeout(ctx, defaultCheckoutTimeout, func() error {
+			util.UmountPath(ctx, sourcePath)
+			return nil
+		})
 		// clean mount point
 		err = util.DoWithTimeout(ctx, defaultCheckoutTimeout, func() error {
 			log.Info("Clean mount point", "mountPath", sourcePath)
@@ -736,7 +739,10 @@ func (p *PodDriver) umountTargetUntilRemain(ctx context.Context, basemi *mountIt
 			return nil
 		}
 
-		util.UmountPath(subCtx, target)
+		_ = util.DoWithTimeout(ctx, defaultCheckoutTimeout, func() error {
+			util.UmountPath(subCtx, target)
+			return nil
+		})
 	}
 }
 

diff --git a/pkg/fuse/passfd/passfd.go b/pkg/fuse/passfd/passfd.go
@@ -172,7 +172,9 @@ func (fs *Fds) CloseFd(podHashVal string) {
 
 func (fs *Fds) parseFuse(ctx context.Context, podHashVal, fusePath string) {
 	fuseFd, fuseSetting := GetFuseFd(fusePath, false)
-	if fuseFd < 0 {
+	if fuseFd <= 0 {
+		// if can not get fuse fd, do not serve for it
+		fdLog.V(1).Info("get fuse fd error, ignore it", "fusePath", fusePath)
 		return
 	}
 
@@ -338,6 +340,7 @@ func GetFuseFd(path string, close bool) (int, []byte) {
 		exists, err = k8sMount.PathExists(path)
 		return
 	}); err != nil {
+		fdLog.V(1).Info("path exists error", "path", path)
 		return -1, nil
 	}
 

diff --git a/pkg/juicefs/juicefs.go b/pkg/juicefs/juicefs.go
@@ -173,7 +173,10 @@ func (fs *jfs) BindTarget(ctx context.Context, bindSource, target string) error
 		}
 		// target is bind by other path, umount it
 		log.Info("target bind mount to other path, umount it", "target", target)
-		util.UmountPath(ctx, target)
+		_ = util.DoWithTimeout(ctx, defaultCheckTimeout, func() error {
+			util.UmountPath(ctx, target)
+			return nil
+		})
 	}
 	// bind target to mountpath
 	log.Info("binding source at target", "source", bindSource, "target", target)
@@ -578,7 +581,10 @@ func (j *juicefs) CreateTarget(ctx context.Context, target string) error {
 			return os.MkdirAll(target, os.FileMode(0755))
 		} else if corruptedMnt = mount.IsCorruptedMnt(err); corruptedMnt {
 			// if target is a corrupted mount, umount it
-			util.UmountPath(ctx, target)
+			_ = util.DoWithTimeout(ctx, defaultCheckTimeout, func() error {
+				util.UmountPath(ctx, target)
+				return nil
+			})
 			continue
 		} else {
 			return err