diff options
| author | Yoni Nakache <45972051+LazyDBA247-Anyvision@users.noreply.github.com> | 2021-01-13 22:32:23 +0200 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-01-13 22:32:23 +0200 |
| commit | d1959de03894fb77753be622f18ec70e0a45eb43 (patch) | |
| tree | 31bc579b3c780dc6ce3e412b892da246fefa6d1a /weed/command/server.go | |
| parent | 95982e0856dcde5cd7542532367c436503d39a7a (diff) | |
| parent | 3fb2ed90932f608b3fd8e9c29d32663b7402e8eb (diff) | |
| download | seaweedfs-d1959de03894fb77753be622f18ec70e0a45eb43.tar.xz seaweedfs-d1959de03894fb77753be622f18ec70e0a45eb43.zip | |
Merge branch 'master' into master
Diffstat (limited to 'weed/command/server.go')
| -rw-r--r-- | weed/command/server.go | 9 |
1 files changed, 7 insertions, 2 deletions
diff --git a/weed/command/server.go b/weed/command/server.go index bd25f94b1..9976db2ea 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -61,6 +61,7 @@ var ( serverMetricsHttpPort = cmdServer.Flag.Int("metricsPort", 0, "Prometheus metrics listen port") // pulseSeconds = cmdServer.Flag.Int("pulseSeconds", 5, "number of seconds between heartbeats") + isStartingMasterServer = cmdServer.Flag.Bool("master", true, "whether to start master server") isStartingVolumeServer = cmdServer.Flag.Bool("volume", true, "whether to start volume server") isStartingFiler = cmdServer.Flag.Bool("filer", false, "whether to start filer") isStartingS3 = cmdServer.Flag.Bool("s3", false, "whether to start S3 gateway") @@ -94,7 +95,7 @@ func init() { filerOptions.dirListingLimit = cmdServer.Flag.Int("filer.dirListLimit", 1000, "limit sub dir listing size") filerOptions.cipher = cmdServer.Flag.Bool("filer.encryptVolumeData", false, "encrypt data on volume servers") filerOptions.peers = cmdServer.Flag.String("filer.peers", "", "all filers sharing the same filer store in comma separated ip:port list") - filerOptions.cacheToFilerLimit = cmdServer.Flag.Int("filer.cacheToFilerLimit", 0, "Small files smaller than this limit can be cached in filer store.") + filerOptions.saveToFilerLimit = cmdServer.Flag.Int("filer.saveToFilerLimit", 0, "Small files smaller than this limit can be cached in filer store.") serverOptions.v.port = cmdServer.Flag.Int("volume.port", 8080, "volume server http listen port") serverOptions.v.publicPort = cmdServer.Flag.Int("volume.port.public", 0, "volume server public port") @@ -224,7 +225,11 @@ func runServer(cmd *Command, args []string) bool { } - startMaster(masterOptions, serverWhiteList) + if *isStartingMasterServer { + go startMaster(masterOptions, serverWhiteList) + } + + select {} return true } |