aboutsummaryrefslogtreecommitdiff
path: root/pkg
diff options
context:
space:
mode:
authorgarenchan <garenchan23@gmail.com>2022-07-07 17:13:23 +0800
committergarenchan <garenchan23@gmail.com>2022-07-07 17:13:23 +0800
commit4debdd863c7b0b8ebf695ffe7bbd0a7d74d421c1 (patch)
tree4cf321a142fa85453b6256009f3b38d46f2ed2b5 /pkg
parent6ddcbbdcc3f7f3ad4c5eac20cff98fe46b0566a3 (diff)
downloadseaweedfs-csi-driver-4debdd863c7b0b8ebf695ffe7bbd0a7d74d421c1.tar.xz
seaweedfs-csi-driver-4debdd863c7b0b8ebf695ffe7bbd0a7d74d421c1.zip
Fix error to avoid zombie processes
Diffstat (limited to 'pkg')
-rw-r--r--pkg/driver/mounter.go7
-rw-r--r--pkg/driver/volume.go7
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
}