dominik/seaweedfs-csi-driver
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Chris Lu 2021-01-11 11:26:51 -08:00
parent 0ddc866b7f
commit fcc0835e93
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
pkg/driver/mounter.go
View File

@ -19,8 +19,8 @@ type Mounter interface {
Mount(target string) error Mount(target string) error
} }
func newMounter(bucketName string, filer string) (Mounter, error) { func newMounter(bucketName string, driver *SeaweedFsDriver) (Mounter, error) {
return newSeaweedFsMounter(bucketName, filer) return newSeaweedFsMounter(bucketName, driver)
} }
func fuseMount(path string, command string, args []string) error { func fuseMount(path string, command string, args []string) error {

16
pkg/driver/mounter_seaweedfs.go
View File

@ -8,23 +8,23 @@ import (
// Implements Mounter // Implements Mounter
type seaweedFsMounter struct { type seaweedFsMounter struct {
bucketName string bucketName string
filerUrl string driver *SeaweedFsDriver
} }
const ( const (
seaweedFsCmd = "weed" seaweedFsCmd = "weed"
) )
func newSeaweedFsMounter(bucketName string, filer string) (Mounter, error) { func newSeaweedFsMounter(bucketName string, driver *SeaweedFsDriver) (Mounter, error) {
return &seaweedFsMounter{ return &seaweedFsMounter{
bucketName: bucketName, bucketName: bucketName,
filerUrl: filer, driver: driver,
}, nil }, nil
} }
func (seaweedFs *seaweedFsMounter) Mount(target string) error { func (seaweedFs *seaweedFsMounter) Mount(target string) error {
glog.V(0).Infof("mounting %s%s to %s", seaweedFs.filerUrl, seaweedFs.bucketName, target) glog.V(0).Infof("mounting %s%s to %s", seaweedFs.driver.filer, seaweedFs.bucketName, target)
args := []string{ args := []string{
"mount", "mount",
@ -32,12 +32,12 @@ func (seaweedFs *seaweedFsMounter) Mount(target string) error {
"-umask=000", "-umask=000",
fmt.Sprintf("-dir=%s", target), fmt.Sprintf("-dir=%s", target),
fmt.Sprintf("-collection=%s", seaweedFs.bucketName), fmt.Sprintf("-collection=%s", seaweedFs.bucketName),
fmt.Sprintf("-filer=%s", seaweedFs.filerUrl), fmt.Sprintf("-filer=%s", seaweedFs.driver.filer),
fmt.Sprintf("-filer.path=/buckets/%s", seaweedFs.bucketName), fmt.Sprintf("-filer.path=/buckets/%s", seaweedFs.bucketName),
} }
err := fuseMount(target, seaweedFsCmd, args) err := fuseMount(target, seaweedFsCmd, args)
if err != nil { if err != nil {
glog.Errorf("mount %s%s to %s: %s", seaweedFs.filerUrl, seaweedFs.bucketName, target, err) glog.Errorf("mount %s%s to %s: %s", seaweedFs.driver.filer, seaweedFs.bucketName, target, err)
} }
return err return err
} }

2
pkg/driver/nodeserver.go
View File

@ -55,7 +55,7 @@ func (ns *NodeServer) NodePublishVolume(ctx context.Context, req *csi.NodePublis
mo = append(mo, "ro") mo = append(mo, "ro")
} }
mounter, err := newMounter(volumeID, ns.Driver.filer) mounter, err := newMounter(volumeID, ns.Driver)
if err != nil { if err != nil {
return nil, err return nil, err
} }