aboutsummaryrefslogtreecommitdiff
path: root/pkg/driver/utils.go
diff options
context:
space:
mode:
authorChris Lu <chrislusf@users.noreply.github.com>2023-08-06 18:21:55 -0700
committerGitHub <noreply@github.com>2023-08-06 18:21:55 -0700
commit615c145190e7cb880bf2542d3ae9e750b28b9a89 (patch)
treee3c646e031c35b0299d58407994b10b5ed38a89a /pkg/driver/utils.go
parentd777b8750bb2dd33948988f4eec8813e6207a0cd (diff)
parenteca9cde95a899ab5645b00d8c0d547abd4bc7e8e (diff)
downloadseaweedfs-csi-driver-615c145190e7cb880bf2542d3ae9e750b28b9a89.tar.xz
seaweedfs-csi-driver-615c145190e7cb880bf2542d3ae9e750b28b9a89.zip
Merge pull request #131 from kvaster/refactor-1
Update dependencies
Diffstat (limited to 'pkg/driver/utils.go')
-rw-r--r--pkg/driver/utils.go13
1 files changed, 6 insertions, 7 deletions
diff --git a/pkg/driver/utils.go b/pkg/driver/utils.go
index 837d5a4..eee1825 100644
--- a/pkg/driver/utils.go
+++ b/pkg/driver/utils.go
@@ -12,7 +12,7 @@ import (
"github.com/seaweedfs/seaweedfs/weed/glog"
"golang.org/x/net/context"
"google.golang.org/grpc"
- "k8s.io/utils/mount"
+ "k8s.io/mount-utils"
)
func NewNodeServer(n *SeaweedFsDriver) *NodeServer {
@@ -70,24 +70,23 @@ func logGRPC(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, h
}
func checkMount(targetPath string) (bool, error) {
- mounter := mount.New("")
- notMnt, err := mount.IsNotMountPoint(mounter, targetPath)
+ isMnt, err := mountutil.IsMountPoint(targetPath)
if err != nil {
if os.IsNotExist(err) {
if err = os.MkdirAll(targetPath, 0750); err != nil {
return false, err
}
- notMnt = true
+ isMnt = false
} else if mount.IsCorruptedMnt(err) {
- if err := mounter.Unmount(targetPath); err != nil {
+ if err := mountutil.Unmount(targetPath); err != nil {
return false, err
}
- notMnt, err = mount.IsNotMountPoint(mounter, targetPath)
+ isMnt, err = mountutil.IsMountPoint(targetPath)
} else {
return false, err
}
}
- return notMnt, nil
+ return isMnt, nil
}
func removeDirContent(path string) error {