diff options
| author | eddy-gfx <86091021+gfxlabs@users.noreply.github.com> | 2022-02-27 04:52:08 -0600 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2022-02-27 04:52:08 -0600 |
| commit | fb940dd807e47e6c4f86af9d59869f346997b137 (patch) | |
| tree | 63b909be07b030f878a77d258a2deb92deb69ff7 | |
| parent | 881a0fe8068cc197378967527663500161f2ff20 (diff) | |
| parent | 22362f64958f8587992f98eb2f7fac95fd204516 (diff) | |
| download | seaweedfs-fb940dd807e47e6c4f86af9d59869f346997b137.tar.xz seaweedfs-fb940dd807e47e6c4f86af9d59869f346997b137.zip | |
Merge branch 'chrislusf:master' into acl-pr
| -rwxr-xr-x | docker/entrypoint.sh | 10 | ||||
| -rw-r--r-- | weed/command/mount2_std.go | 33 |
2 files changed, 33 insertions, 10 deletions
diff --git a/docker/entrypoint.sh b/docker/entrypoint.sh index 856943a0b..6818d9581 100755 --- a/docker/entrypoint.sh +++ b/docker/entrypoint.sh @@ -24,7 +24,7 @@ case "$1" in 'master') ARGS="-mdir=/data -volumePreallocate -volumeSizeLimitMB=1024" shift - exec /usr/bin/weed master $ARGS $@ + exec /usr/bin/weed -logtostderr=true master $ARGS $@ ;; 'volume') @@ -33,7 +33,7 @@ case "$1" in ARGS="-dir=/data" fi shift - exec /usr/bin/weed volume $ARGS $@ + exec /usr/bin/weed -logtostderr=true volume $ARGS $@ ;; 'server') @@ -42,19 +42,19 @@ case "$1" in ARGS="-dir=/data -master.volumePreallocate -master.volumeSizeLimitMB=1024" fi shift - exec /usr/bin/weed server $ARGS $@ + exec /usr/bin/weed -logtostderr=true server $ARGS $@ ;; 'filer') ARGS="" shift - exec /usr/bin/weed filer $ARGS $@ + exec /usr/bin/weed -logtostderr=true filer $ARGS $@ ;; 's3') ARGS="-domainName=$S3_DOMAIN_NAME -key.file=$S3_KEY_FILE -cert.file=$S3_CERT_FILE" shift - exec /usr/bin/weed s3 $ARGS $@ + exec /usr/bin/weed -logtostderr=true s3 $ARGS $@ ;; *) diff --git a/weed/command/mount2_std.go b/weed/command/mount2_std.go index 9f87b35b5..61555d8f2 100644 --- a/weed/command/mount2_std.go +++ b/weed/command/mount2_std.go @@ -155,13 +155,36 @@ func RunMount2(option *Mount2Options, umask os.FileMode) bool { Name: "seaweedfs", SingleThreaded: false, DisableXAttrs: false, - Debug: false, // *option.debug, + Debug: *option.debug, EnableLocks: false, ExplicitDataCacheControl: false, - // SyncRead: false, // set to false to enable the FUSE_CAP_ASYNC_READ capability - DirectMount: true, - DirectMountFlags: 0, - // EnableAcl: false, + DirectMount: true, + DirectMountFlags: 0, + //SyncRead: false, // set to false to enable the FUSE_CAP_ASYNC_READ capability + //EnableAcl: true, + } + if *option.nonempty { + fuseMountOptions.Options = append(fuseMountOptions.Options, "nonempty") + } + if *option.readOnly { + if runtime.GOOS == "darwin" { + fuseMountOptions.Options = append(fuseMountOptions.Options, "rdonly") + } else { + fuseMountOptions.Options = append(fuseMountOptions.Options, "ro") + } + } + if runtime.GOOS == "darwin" { + // https://github-wiki-see.page/m/macfuse/macfuse/wiki/Mount-Options + ioSizeMB := 1 + for ioSizeMB*2 <= *option.chunkSizeLimitMB && ioSizeMB*2 <= 32 { + ioSizeMB *= 2 + } + fuseMountOptions.Options = append(fuseMountOptions.Options, "daemon_timeout=600") + fuseMountOptions.Options = append(fuseMountOptions.Options, "noapplexattr") + // fuseMountOptions.Options = append(fuseMountOptions.Options, "novncache") // need to test effectiveness + fuseMountOptions.Options = append(fuseMountOptions.Options, "slow_statfs") + fuseMountOptions.Options = append(fuseMountOptions.Options, "volname="+*option.filer) + fuseMountOptions.Options = append(fuseMountOptions.Options, fmt.Sprintf("iosize=%d", ioSizeMB*1024*1024)) } // find mount point |