From cb920765f5d0b3b7a6a54b9bacf5e9be28b46102 Mon Sep 17 00:00:00 2001 From: Viktor Kuzmin Date: Sun, 6 Aug 2023 15:06:41 +0300 Subject: Update dependencies, move from deprecated k8s.io/utils/mount to k8s.io/mount-utils --- pkg/driver/utils.go | 10 +++++----- 1 file changed, 5 insertions(+), 5 deletions(-) (limited to 'pkg/driver/utils.go') diff --git a/pkg/driver/utils.go b/pkg/driver/utils.go index 837d5a4..ea83209 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 { @@ -71,23 +71,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 := mounter.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 { return false, err } - notMnt, err = mount.IsNotMountPoint(mounter, targetPath) + isMnt, err = mounter.IsMountPoint(targetPath) } else { return false, err } } - return notMnt, nil + return isMnt, nil } func removeDirContent(path string) error { -- cgit v1.2.3 From eca9cde95a899ab5645b00d8c0d547abd4bc7e8e Mon Sep 17 00:00:00 2001 From: Viktor Kuzmin Date: Sun, 6 Aug 2023 20:55:56 +0300 Subject: Use single instance of mount utility - mount.New is expensive --- pkg/driver/utils.go | 7 +++---- 1 file changed, 3 insertions(+), 4 deletions(-) (limited to 'pkg/driver/utils.go') diff --git a/pkg/driver/utils.go b/pkg/driver/utils.go index ea83209..eee1825 100644 --- a/pkg/driver/utils.go +++ b/pkg/driver/utils.go @@ -70,8 +70,7 @@ func logGRPC(ctx context.Context, req interface{}, info *grpc.UnaryServerInfo, h } func checkMount(targetPath string) (bool, error) { - mounter := mount.New("") - isMnt, err := mounter.IsMountPoint(targetPath) + isMnt, err := mountutil.IsMountPoint(targetPath) if err != nil { if os.IsNotExist(err) { if err = os.MkdirAll(targetPath, 0750); err != nil { @@ -79,10 +78,10 @@ func checkMount(targetPath string) (bool, error) { } isMnt = false } else if mount.IsCorruptedMnt(err) { - if err := mounter.Unmount(targetPath); err != nil { + if err := mountutil.Unmount(targetPath); err != nil { return false, err } - isMnt, err = mounter.IsMountPoint(targetPath) + isMnt, err = mountutil.IsMountPoint(targetPath) } else { return false, err } -- cgit v1.2.3