Browse Source

just exit in case of duplicated volume directories were loaded

pull/3059/head
guol-fnst 3 years ago
committed by guol-fnst
parent
commit
076595fbdd
  1. 2
      weed/command/volume.go
  2. 5
      weed/server/volume_grpc_client_to_master.go
  3. 3
      weed/server/volume_server.go

2
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() {

5
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())

3
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

Loading…
Cancel
Save