diff options
Diffstat (limited to 'weed')
| -rw-r--r-- | weed/command/filer.go | 9 | ||||
| -rw-r--r-- | weed/command/server.go | 1 | ||||
| -rw-r--r-- | weed/server/filer_server.go | 1 |
3 files changed, 0 insertions, 11 deletions
diff --git a/weed/command/filer.go b/weed/command/filer.go index fdd8cb4f2..633e02d79 100644 --- a/weed/command/filer.go +++ b/weed/command/filer.go @@ -4,7 +4,6 @@ import ( "fmt" "net/http" "os" - "strings" "time" "google.golang.org/grpc/reflection" @@ -46,7 +45,6 @@ type FilerOptions struct { enableNotification *bool disableHttp *bool cipher *bool - peers *string metricsHttpPort *int saveToFilerLimit *int defaultLevelDbDirectory *string @@ -72,7 +70,6 @@ func init() { f.rack = cmdFiler.Flag.String("rack", "", "prefer to write to volumes in this rack") f.disableHttp = cmdFiler.Flag.Bool("disableHttp", false, "disable http request, only gRpc operations are allowed") f.cipher = cmdFiler.Flag.Bool("encryptVolumeData", false, "encrypt data on volume servers") - f.peers = cmdFiler.Flag.String("peers", "", "all filers sharing the same filer store in comma separated ip:port list") f.metricsHttpPort = cmdFiler.Flag.Int("metricsPort", 0, "Prometheus metrics listen port") f.saveToFilerLimit = cmdFiler.Flag.Int("saveToFilerLimit", 0, "files smaller than this limit will be saved in filer store") f.defaultLevelDbDirectory = cmdFiler.Flag.String("defaultStoreDir", ".", "if filer.toml is empty, use an embedded filer store in the directory") @@ -186,11 +183,6 @@ func (fo *FilerOptions) startFiler() { defaultLevelDbDirectory := util.ResolvePath(*fo.defaultLevelDbDirectory + "/filerldb2") - var peers []string - if *fo.peers != "" { - peers = strings.Split(*fo.peers, ",") - } - filerAddress := pb.NewServerAddress(*fo.ip, *fo.port, *fo.portGrpc) fs, nfs_err := weed_server.NewFilerServer(defaultMux, publicVolumeMux, &weed_server.FilerOption{ @@ -207,7 +199,6 @@ func (fo *FilerOptions) startFiler() { Host: filerAddress, Cipher: *fo.cipher, SaveToFilerLimit: int64(*fo.saveToFilerLimit), - Filers: pb.FromAddressStrings(peers), ConcurrentUploadLimit: int64(*fo.concurrentUploadLimitMB) * 1024 * 1024, }) if nfs_err != nil { diff --git a/weed/command/server.go b/weed/command/server.go index a80ef6796..5c6c4b1cf 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -106,7 +106,6 @@ func init() { filerOptions.maxMB = cmdServer.Flag.Int("filer.maxMB", 4, "split files larger than the limit") 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.saveToFilerLimit = cmdServer.Flag.Int("filer.saveToFilerLimit", 0, "Small files smaller than this limit can be cached in filer store.") filerOptions.concurrentUploadLimitMB = cmdServer.Flag.Int("filer.concurrentUploadLimitMB", 64, "limit total concurrent upload size") diff --git a/weed/server/filer_server.go b/weed/server/filer_server.go index a47fdb28c..e5f5a092e 100644 --- a/weed/server/filer_server.go +++ b/weed/server/filer_server.go @@ -61,7 +61,6 @@ type FilerOption struct { recursiveDelete bool Cipher bool SaveToFilerLimit int64 - Filers []pb.ServerAddress ConcurrentUploadLimit int64 } |