diff options
Diffstat (limited to 'pkg')
| -rw-r--r-- | pkg/driver/mounter.go | 7 | ||||
| -rw-r--r-- | pkg/driver/volume.go | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkg/driver/mounter.go b/pkg/driver/mounter.go index 2c019ed..22b162c 100644 --- a/pkg/driver/mounter.go +++ b/pkg/driver/mounter.go @@ -44,6 +44,13 @@ func fuseMount(path string, command string, args []string) error { return fmt.Errorf("Error fuseMount command: %s\nargs: %s\nerror: %v", command, args, err) } + // avoid zombie processes + go func() { + if err := cmd.Wait(); err != nil { + glog.Errorf("weed mount process %d exit: %v", cmd.Process.Pid, err) + } + }() + return waitForMount(path, 10*time.Second) } diff --git a/pkg/driver/volume.go b/pkg/driver/volume.go index 44b4e65..6a4e86d 100644 --- a/pkg/driver/volume.go +++ b/pkg/driver/volume.go @@ -7,7 +7,6 @@ import ( "github.com/chrislusf/seaweedfs/weed/glog" "github.com/chrislusf/seaweedfs/weed/pb/mount_pb" - "github.com/chrislusf/seaweedfs/weed/util" "google.golang.org/grpc" "google.golang.org/grpc/credentials/insecure" ) @@ -136,12 +135,8 @@ func (vol *Volume) getLocalSocket() string { return vol.localSocket } - montDirHash := util.HashToInt32([]byte(vol.VolumeId)) - if montDirHash < 0 { - montDirHash = -montDirHash - } + socket := GetLocalSocket(vol.VolumeId) - socket := fmt.Sprintf("/tmp/seaweedfs-mount-%d.sock", montDirHash) vol.localSocket = socket return socket } |