diff options
| author | chrislu <chris.lu@gmail.com> | 2024-06-12 00:32:04 -0700 |
|---|---|---|
| committer | chrislu <chris.lu@gmail.com> | 2024-06-12 00:32:04 -0700 |
| commit | 458dda56ae387fc5341fb3dd9b08a07449924749 (patch) | |
| tree | 37b39a6bd278724e14f83e2d58b90e3bf963c506 /weed/command | |
| parent | 0cd1c4be48e634740de1d83c5b34b77bed984f27 (diff) | |
| parent | 4744889973536c8bc72de3c5d91650ea53193745 (diff) | |
| download | seaweedfs-458dda56ae387fc5341fb3dd9b08a07449924749.tar.xz seaweedfs-458dda56ae387fc5341fb3dd9b08a07449924749.zip | |
Merge branch 'master' into mq
Diffstat (limited to 'weed/command')
| -rw-r--r-- | weed/command/filer.go | 3 | ||||
| -rw-r--r-- | weed/command/server.go | 1 |
2 files changed, 4 insertions, 0 deletions
diff --git a/weed/command/filer.go b/weed/command/filer.go index 1d8a6c4b8..877c4b5d5 100644 --- a/weed/command/filer.go +++ b/weed/command/filer.go @@ -63,6 +63,7 @@ type FilerOptions struct { diskType *string allowedOrigins *string exposeDirectoryData *bool + joinExistingFiler *bool } func init() { @@ -95,6 +96,7 @@ func init() { f.diskType = cmdFiler.Flag.String("disk", "", "[hdd|ssd|<tag>] hard drive or solid state drive or any tag") f.allowedOrigins = cmdFiler.Flag.String("allowedOrigins", "*", "comma separated list of allowed origins") f.exposeDirectoryData = cmdFiler.Flag.Bool("exposeDirectoryData", true, "whether to return directory metadata and content in Filer UI") + f.joinExistingFiler = cmdFiler.Flag.Bool("joinExistingFiler", false, "enable if new filer wants to join existing cluster") // start s3 on filer filerStartS3 = cmdFiler.Flag.Bool("s3", false, "whether to start S3 gateway") @@ -262,6 +264,7 @@ func (fo *FilerOptions) startFiler() { DownloadMaxBytesPs: int64(*fo.downloadMaxMBps) * 1024 * 1024, DiskType: *fo.diskType, AllowedOrigins: strings.Split(*fo.allowedOrigins, ","), + JoinExistingFiler: *fo.joinExistingFiler, }) if nfs_err != nil { glog.Fatalf("Filer startup error: %v", nfs_err) diff --git a/weed/command/server.go b/weed/command/server.go index 63133b80c..503927629 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -119,6 +119,7 @@ func init() { filerOptions.downloadMaxMBps = cmdServer.Flag.Int("filer.downloadMaxMBps", 0, "download max speed for each download request, in MB per second") filerOptions.diskType = cmdServer.Flag.String("filer.disk", "", "[hdd|ssd|<tag>] hard drive or solid state drive or any tag") filerOptions.exposeDirectoryData = cmdServer.Flag.Bool("filer.exposeDirectoryData", true, "expose directory data via filer. If false, filer UI will be innaccessible.") + filerOptions.joinExistingFiler = cmdServer.Flag.Bool("filer.joinExistingFiler", false, "enable if new filer wants to join existing cluster") serverOptions.v.port = cmdServer.Flag.Int("volume.port", 8080, "volume server http listen port") serverOptions.v.portGrpc = cmdServer.Flag.Int("volume.port.grpc", 0, "volume server grpc listen port") |