diff options
| author | Chris Lu <chris.lu@gmail.com> | 2018-06-01 00:39:39 -0700 |
|---|---|---|
| committer | Chris Lu <chris.lu@gmail.com> | 2018-06-01 00:39:39 -0700 |
| commit | 43e3f5724ca31918cd5a3d282639bd4f34e6bc58 (patch) | |
| tree | 8aa653c78756a9adc2f98e7e281e0892bad95735 /weed/command/server.go | |
| parent | a6f7f9b0b8baedad7b1555c7e01a4ab3cec3784c (diff) | |
| download | seaweedfs-43e3f5724ca31918cd5a3d282639bd4f34e6bc58.tar.xz seaweedfs-43e3f5724ca31918cd5a3d282639bd4f34e6bc58.zip | |
use fixed list of masters in both filer and volume servers
Diffstat (limited to 'weed/command/server.go')
| -rw-r--r-- | weed/command/server.go | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/weed/command/server.go b/weed/command/server.go index 503b2c61d..606845199 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -83,7 +83,6 @@ var ( func init() { serverOptions.cpuprofile = cmdServer.Flag.String("cpuprofile", "", "cpu profile output file") - filerOptions.master = cmdServer.Flag.String("filer.master", "", "default to current master server") filerOptions.collection = cmdServer.Flag.String("filer.collection", "", "all data will be stored in this collection") filerOptions.port = cmdServer.Flag.Int("filer.port", 8888, "filer server http listen port") filerOptions.publicPort = cmdServer.Flag.Int("filer.port.public", 0, "filer server public http listen port") @@ -108,7 +107,7 @@ func runServer(cmd *Command, args []string) bool { *isStartingFiler = true } - *filerOptions.master = *serverIp + ":" + strconv.Itoa(*masterPort) + master := *serverIp + ":" + strconv.Itoa(*masterPort) filerOptions.ip = serverIp if *filerOptions.defaultReplicaPlacement == "" { @@ -251,7 +250,7 @@ func runServer(cmd *Command, args []string) bool { *serverIp, *volumePort, *volumeServerPublicUrl, folders, maxCounts, volumeNeedleMapKind, - *serverIp+":"+strconv.Itoa(*masterPort), *volumePulse, *serverDataCenter, *serverRack, + []string{master}, *volumePulse, *serverDataCenter, *serverRack, serverWhiteList, *volumeFixJpgOrientation, *volumeReadRedirect, ) |