diff options
| author | ustuzhanin <55892859+ustuzhanin@users.noreply.github.com> | 2020-10-04 19:46:45 +0500 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2020-10-04 19:46:45 +0500 |
| commit | b3dd0ba446649d3a3fe56dba547585bf18b039b7 (patch) | |
| tree | fc22104e5b6b0ddd3c41ab02a72b2428130c2363 /weed/command/master.go | |
| parent | 3e0a79ef050dba9e5347d20537ef562cc4b30b62 (diff) | |
| parent | 8c8b8e2835801992ecd75349281637ed8ecb88cd (diff) | |
| download | seaweedfs-b3dd0ba446649d3a3fe56dba547585bf18b039b7.tar.xz seaweedfs-b3dd0ba446649d3a3fe56dba547585bf18b039b7.zip | |
Merge pull request #2 from chrislusf/master
update from upstream
Diffstat (limited to 'weed/command/master.go')
| -rw-r--r-- | weed/command/master.go | 8 |
1 files changed, 5 insertions, 3 deletions
diff --git a/weed/command/master.go b/weed/command/master.go index 144962f63..a42983259 100644 --- a/weed/command/master.go +++ b/weed/command/master.go @@ -41,6 +41,7 @@ type MasterOptions struct { disableHttp *bool metricsAddress *string metricsIntervalSec *int + raftResumeState *bool } func init() { @@ -59,6 +60,7 @@ func init() { m.disableHttp = cmdMaster.Flag.Bool("disableHttp", false, "disable http requests, only gRPC operations are allowed.") m.metricsAddress = cmdMaster.Flag.String("metrics.address", "", "Prometheus gateway address <host>:<port>") m.metricsIntervalSec = cmdMaster.Flag.Int("metrics.intervalSeconds", 15, "Prometheus push interval in seconds") + m.raftResumeState = cmdMaster.Flag.Bool("resumeState", false, "resume previous state on start master server") } var cmdMaster = &Command{ @@ -118,10 +120,10 @@ func startMaster(masterOption MasterOptions, masterWhiteList []string) { glog.Fatalf("Master startup error: %v", e) } // start raftServer - raftServer := weed_server.NewRaftServer(security.LoadClientTLS(util.GetViper(), "grpc.master"), - peers, myMasterAddress, util.ResolvePath(*masterOption.metaFolder), ms.Topo, 5) + raftServer, err := weed_server.NewRaftServer(security.LoadClientTLS(util.GetViper(), "grpc.master"), + peers, myMasterAddress, util.ResolvePath(*masterOption.metaFolder), ms.Topo, 5, *masterOption.raftResumeState) if raftServer == nil { - glog.Fatalf("please verify %s is writable, see https://github.com/chrislusf/seaweedfs/issues/717", *masterOption.metaFolder) + glog.Fatalf("please verify %s is writable, see https://github.com/chrislusf/seaweedfs/issues/717: %s", *masterOption.metaFolder, err) } ms.SetRaftServer(raftServer) r.HandleFunc("/cluster/status", raftServer.StatusHandler).Methods("GET") |