diff options
| author | LHHDZ <changlin.shi@ly.com> | 2022-06-20 13:42:18 +0800 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-06-20 13:42:18 +0800 |
| commit | 8db9f13bc69be974fbd18c4b0aacd071ea1acaa9 (patch) | |
| tree | e84927ea360a7ede80d13fe7aada59356c0475ce /weed/command/server.go | |
| parent | 9e036df3566e842710ea2b0ed3ad28f5af2a1885 (diff) | |
| parent | 1baa7ead59a0a040d1165e3579cf79f90c20dd65 (diff) | |
| download | seaweedfs-8db9f13bc69be974fbd18c4b0aacd071ea1acaa9.tar.xz seaweedfs-8db9f13bc69be974fbd18c4b0aacd071ea1acaa9.zip | |
Merge branch 'master' into circuit_breaker
Diffstat (limited to 'weed/command/server.go')
| -rw-r--r-- | weed/command/server.go | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/weed/command/server.go b/weed/command/server.go index 4b6b6c642..b1812bb9b 100644 --- a/weed/command/server.go +++ b/weed/command/server.go @@ -2,8 +2,6 @@ package command import ( "fmt" - "github.com/chrislusf/seaweedfs/weed/pb" - "github.com/chrislusf/seaweedfs/weed/util/grace" "net/http" "os" "strings" @@ -12,7 +10,9 @@ import ( stats_collect "github.com/chrislusf/seaweedfs/weed/stats" "github.com/chrislusf/seaweedfs/weed/glog" + "github.com/chrislusf/seaweedfs/weed/pb" "github.com/chrislusf/seaweedfs/weed/util" + "github.com/chrislusf/seaweedfs/weed/util/grace" ) type ServerOptions struct { @@ -114,6 +114,7 @@ func init() { 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") filerOptions.localSocket = cmdServer.Flag.String("filer.localSocket", "", "default to /tmp/seaweedfs-filer-<port>.sock") + filerOptions.showUIDirectoryDelete = cmdServer.Flag.Bool("filer.ui.deleteDir", true, "enable filer UI show delete directory button") 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") @@ -131,6 +132,7 @@ func init() { serverOptions.v.pprof = cmdServer.Flag.Bool("volume.pprof", false, "enable pprof http handlers. precludes --memprofile and --cpuprofile") serverOptions.v.idxFolder = cmdServer.Flag.String("volume.dir.idx", "", "directory to store .idx files") serverOptions.v.enableTcp = cmdServer.Flag.Bool("volume.tcp", false, "<exprimental> enable tcp port") + serverOptions.v.inflightUploadDataTimeout = cmdServer.Flag.Duration("volume.inflightUploadDataTimeout", 60*time.Second, "inflight upload data wait timeout of volume servers") s3Options.port = cmdServer.Flag.Int("s3.port", 8333, "s3 server http listen port") s3Options.portGrpc = cmdServer.Flag.Int("s3.port.grpc", 0, "s3 server grpc listen port") |