gitlab-com-seaweedfs/seaweedfs
1
0
Fork 0
mirror of https://github.com/seaweedfs/seaweedfs.git synced 2024-01-19 02:48:24 +00:00
Code Issues Projects Releases Wiki Activity

refactor(socket mount): Update socket mount pattern to `/tmp/seaweedf… (#3662)

Browse source
This commit is contained in:
Ryan Russell 2022-09-14 11:14:44 -05:00 committed by GitHub
parent b6a1b84a00
commit 19652c1b83
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
weed/command/filer.go
View file

@ -295,7 +295,7 @@ func (fo *FilerOptions) startFiler() {
if runtime.GOOS != "windows" { if runtime.GOOS != "windows" {
localSocket := *fo.localSocket localSocket := *fo.localSocket
if localSocket == "" { if localSocket == "" {
localSocket = fmt.Sprintf("/tmp/seaweefs-filer-%d.sock", *fo.port) localSocket = fmt.Sprintf("/tmp/seaweedfs-filer-%d.sock", *fo.port)
} }
if err := os.Remove(localSocket); err != nil && !os.IsNotExist(err) { if err := os.Remove(localSocket); err != nil && !os.IsNotExist(err) {
glog.Fatalf("Failed to remove %s, error: %s", localSocket, err.Error()) glog.Fatalf("Failed to remove %s, error: %s", localSocket, err.Error())

2
weed/command/mount_std.go
View file

@ -107,7 +107,7 @@ func RunMount(option *MountOptions, umask os.FileMode) bool {
if mountDirHash < 0 { if mountDirHash < 0 {
mountDirHash = -mountDirHash mountDirHash = -mountDirHash
} }
*option.localSocket = fmt.Sprintf("/tmp/seaweefs-mount-%d.sock", mountDirHash) *option.localSocket = fmt.Sprintf("/tmp/seaweedfs-mount-%d.sock", mountDirHash)
} }
if err := os.Remove(*option.localSocket); err != nil && !os.IsNotExist(err) { if err := os.Remove(*option.localSocket); err != nil && !os.IsNotExist(err) {
glog.Fatalf("Failed to remove %s, error: %s", *option.localSocket, err.Error()) glog.Fatalf("Failed to remove %s, error: %s", *option.localSocket, err.Error())

2
weed/shell/command_mount_configure.go
View file

@ -47,7 +47,7 @@ func (c *commandMountConfigure) Do(args []string, commandEnv *CommandEnv, writer
if mountDirHash < 0 { if mountDirHash < 0 {
mountDirHash = -mountDirHash mountDirHash = -mountDirHash
} }
localSocket := fmt.Sprintf("/tmp/seaweefs-mount-%d.sock", mountDirHash) localSocket := fmt.Sprintf("/tmp/seaweedfs-mount-%d.sock", mountDirHash)
clientConn, err := grpc.Dial("passthrough:///unix://"+localSocket, grpc.WithTransportCredentials(insecure.NewCredentials())) clientConn, err := grpc.Dial("passthrough:///unix://"+localSocket, grpc.WithTransportCredentials(insecure.NewCredentials()))
if err != nil { if err != nil {