NodeUnstageVolume: don't delete target dir

kubernetes-sigs · Sep 30, 2023 · f54d3b5 · f54d3b5
1 parent fa38d41
commit f54d3b5
Show file tree

Hide file tree

Showing 4 changed files with 0 additions and 48 deletions.
diff --git a/pkg/dbfs/nodeserver.go b/pkg/dbfs/nodeserver.go
@@ -286,12 +286,6 @@ func (ns *nodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstag
 		} else {
 			msgLog = fmt.Sprintf("NodeUnstageVolume: VolumeId: %s, mountpoint: %s not mounted, skipping", req.VolumeId, req.StagingTargetPath)
 		}
-		// safe remove mountpoint
-		err = ns.mounter.SafePathRemove(req.StagingTargetPath)
-		if err != nil {
-			log.Log.Errorf("NodeUnstageVolume: VolumeId: %s, Remove targetPath failed, target %v", req.VolumeId, req.StagingTargetPath)
-			return nil, status.Error(codes.Internal, err.Error())
-		}
 	} else {
 		msgLog = fmt.Sprintf("NodeUnstageVolume: VolumeId: %s, Path %s doesn't exist, skip", req.VolumeId, req.StagingTargetPath)
 	}

diff --git a/pkg/disk/nodeserver.go b/pkg/disk/nodeserver.go
@@ -778,12 +778,6 @@ func (ns *nodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstag
 		} else {
 			msgLog = fmt.Sprintf("NodeUnstageVolume: VolumeId: %s, mountpoint: %s not mounted, skipping and continue to detach", req.VolumeId, targetPath)
 		}
-		// safe remove mountpoint
-		err = ns.mounter.SafePathRemove(targetPath)
-		if err != nil {
-			log.Log.Errorf("NodeUnstageVolume: VolumeId: %s, Remove targetPath failed, target %v", req.VolumeId, targetPath)
-			return nil, status.Error(codes.Internal, err.Error())
-		}
 	} else {
 		msgLog = fmt.Sprintf("NodeUnstageVolume: VolumeId: %s, Path %s doesn't exist, continue to detach", req.VolumeId, targetPath)
 	}

diff --git a/pkg/ens/nodeserver.go b/pkg/ens/nodeserver.go
@@ -478,12 +478,6 @@ func (ns *nodeServer) NodeUnstageVolume(ctx context.Context, req *csi.NodeUnstag
 		} else {
 			msgLog = fmt.Sprintf("NodeUnstageVolume: VolumeId: %s, mountpoint: %s not mounted, skipping and continue to detach", req.VolumeId, targetPath)
 		}
-		// safe remove mountpoint
-		err = ns.mounter.SafePathRemove(targetPath)
-		if err != nil {
-			log.Errorf("NodeUnstageVolume: VolumeId: %s, Remove targetPath failed, target %v", req.VolumeId, targetPath)
-			return nil, status.Error(codes.Internal, err.Error())
-		}
 	} else {
 		msgLog = fmt.Sprintf("NodeUnstageVolume: VolumeId: %s, Path %s doesn't exist, continue to detach", req.VolumeId, targetPath)
 	}

diff --git a/pkg/utils/mounter.go b/pkg/utils/mounter.go
@@ -88,8 +88,6 @@ type Mounter interface {
 
 	IsNotMountPoint(file string) (bool, error)
 
-	SafePathRemove(target string) error
-
 	HasMountRefs(mountPath string, mountRefs []string) bool
 }
 
@@ -319,34 +317,6 @@ func (m *mounter) IsMounted(target string) (bool, error) {
 	return false, nil
 }
 
-func (m *mounter) SafePathRemove(targetPath string) error {
-	fo, err := os.Lstat(targetPath)
-	if err != nil {
-		return err
-	}
-	isMounted, err := m.IsMounted(targetPath)
-	if err != nil {
-		return err
-	}
-	if isMounted {
-		return errors.New("Path is mounted, not remove: " + targetPath)
-	}
-	if fo.IsDir() {
-		empty, err := IsDirEmpty(targetPath)
-		if err != nil {
-			return errors.New("Check path empty error: " + targetPath + err.Error())
-		}
-		if !empty {
-			return errors.New("Cannot remove Path not empty: " + targetPath)
-		}
-	}
-	err = os.Remove(targetPath)
-	if err != nil {
-		return err
-	}
-	return nil
-}
-
 func (m *mounter) HasMountRefs(mountPath string, mountRefs []string) bool {
 	count := 0
 	for _, refPath := range mountRefs {