diff options
Diffstat (limited to 'weed/command')
| -rw-r--r-- | weed/command/master.go | 7 | ||||
| -rw-r--r-- | weed/command/scaffold.go | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/weed/command/master.go b/weed/command/master.go index 55e3409ed..d4c2b9b16 100644 --- a/weed/command/master.go +++ b/weed/command/master.go @@ -37,9 +37,6 @@ type MasterOptions struct { disableHttp *bool metricsAddress *string metricsIntervalSec *int - - sequencerType *string - etcdUrls *string } func init() { @@ -58,9 +55,6 @@ 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") m.metricsIntervalSec = cmdMaster.Flag.Int("metrics.intervalSeconds", 15, "Prometheus push interval in seconds") - m.sequencerType = cmdMaster.Flag.String("sequencerType", "memory", "Choose [memory|etcd] type for store the file sequence") - m.etcdUrls = cmdMaster.Flag.String("etcdUrls", "", - "when sequencerType=etcd, set etcdUrls for etcd cluster that store file sequence, example : http://127.0.0.1:2379,http://127.0.0.1:2389") } var cmdMaster = &Command{ @@ -84,6 +78,7 @@ func runMaster(cmd *Command, args []string) bool { util.LoadConfiguration("security", false) util.LoadConfiguration("master", false) + glog.V(0).Infof("%v", viper.GetViper().GetString("master.maintenance.scripts")) runtime.GOMAXPROCS(runtime.NumCPU()) util.SetupProfiling(*masterCpuProfile, *masterMemProfile) diff --git a/weed/command/scaffold.go b/weed/command/scaffold.go index 7a988cdcf..9b266a69d 100644 --- a/weed/command/scaffold.go +++ b/weed/command/scaffold.go @@ -346,5 +346,12 @@ scripts = """ """ sleep_minutes = 17 # sleep minutes between each script execution +sequencer.type = memory # Choose [memory|etcd] type for storing the file id sequence + +# when sequencer.type = etcd, set listen client urls of etcd cluster that store file id sequence +# example : http://127.0.0.1:2379,http://127.0.0.1:2389 +sequencer.etcd.urls = http://127.0.0.1:2379 + + ` ) |