diff options
| author | guol-fnst <goul-fnst@fujitsu.com> | 2022-05-17 11:06:41 +0800 |
|---|---|---|
| committer | guol-fnst <guol-fnst@fujitsu.com> | 2022-05-17 15:41:49 +0800 |
| commit | 076595fbdd50f416998033384c28014f73aae9b9 (patch) | |
| tree | 2490ca219c7354a20bc3a4600939d6c02ebf1dc8 | |
| parent | 8fab39e775bd6d3d4eedad5972cf8cb63c2d2019 (diff) | |
| download | seaweedfs-076595fbdd50f416998033384c28014f73aae9b9.tar.xz seaweedfs-076595fbdd50f416998033384c28014f73aae9b9.zip | |
just exit in case of duplicated volume directories were loaded
| -rw-r--r-- | weed/command/volume.go | 2 | ||||
| -rw-r--r-- | weed/server/volume_grpc_client_to_master.go | 5 | ||||
| -rw-r--r-- | weed/server/volume_server.go | 3 |
3 files changed, 2 insertions, 8 deletions
diff --git a/weed/command/volume.go b/weed/command/volume.go index 645c698b1..b1455352c 100644 --- a/weed/command/volume.go +++ b/weed/command/volume.go @@ -267,7 +267,7 @@ func (v VolumeServerOptions) startVolumeServer(volumeFolders, maxVolumeCounts, v stopChan := make(chan bool) grace.OnInterrupt(func() { - fmt.Println("volume server has be killed") + fmt.Println("volume server has been killed") // Stop heartbeats if !volumeServer.StopHeartbeat() { diff --git a/weed/server/volume_grpc_client_to_master.go b/weed/server/volume_grpc_client_to_master.go index 5e341f07c..f14b8bcaa 100644 --- a/weed/server/volume_grpc_client_to_master.go +++ b/weed/server/volume_grpc_client_to_master.go @@ -3,7 +3,6 @@ package weed_server import ( "fmt" "os" - "syscall" "time" "github.com/chrislusf/seaweedfs/weed/operation" @@ -121,9 +120,7 @@ func (vs *VolumeServer) doHeartbeat(masterAddress pb.ServerAddress, grpcDialOpti } if in.HasDuplicatedDirectory { glog.Error("Shut Down Volume Server due to duplicated volume directory") - glog.V(0).Infof("send SIGINT to Volume Server") - p, _ := os.FindProcess(vs.pid) - p.Signal(syscall.SIGINT) + os.Exit(1) } if in.GetVolumeSizeLimit() != 0 && vs.store.GetVolumeSizeLimit() != in.GetVolumeSizeLimit() { vs.store.SetVolumeSizeLimit(in.GetVolumeSizeLimit()) diff --git a/weed/server/volume_server.go b/weed/server/volume_server.go index f927dbdb8..477a3709c 100644 --- a/weed/server/volume_server.go +++ b/weed/server/volume_server.go @@ -2,7 +2,6 @@ package weed_server import ( "net/http" - "os" "sync" "github.com/chrislusf/seaweedfs/weed/pb" @@ -45,7 +44,6 @@ type VolumeServer struct { fileSizeLimitBytes int64 isHeartbeating bool stopChan chan bool - pid int } func NewVolumeServer(adminMux, publicMux *http.ServeMux, ip string, @@ -89,7 +87,6 @@ func NewVolumeServer(adminMux, publicMux *http.ServeMux, ip string, inFlightDownloadDataLimitCond: sync.NewCond(new(sync.Mutex)), concurrentUploadLimit: concurrentUploadLimit, concurrentDownloadLimit: concurrentDownloadLimit, - pid: os.Getpid(), } vs.SeedMasterNodes = masterNodes |