octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2024-11-18 02:05:13 +00:00
Code Issues Packages Projects Releases Wiki Activity

Typos

Browse Source
This commit is contained in:
Carsten Grohmann 2022-02-21 10:54:26 +01:00 committed by Andrew Gaul
parent 8a5c4306f5
commit afb0897553
3 changed files with 24 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
doc/man/s3fs.1.in
View File

@ -65,7 +65,7 @@ if it is not specified bucket name (and path) in command line, must specify this
.TP .TP
\fB\-o\fR default_acl (default="private") \fB\-o\fR default_acl (default="private")
the default canned acl to apply to all written s3 objects, e.g., "private", "public-read". the default canned acl to apply to all written s3 objects, e.g., "private", "public-read".
see https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl for the full list of canned acls. see https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl for the full list of canned ACLs.
.TP .TP
\fB\-o\fR retries (default="5") \fB\-o\fR retries (default="5")
number of times to retry a failed S3 transaction. number of times to retry a failed S3 transaction.
@ -207,17 +207,17 @@ but lower values may improve performance.
.TP .TP
\fB\-o\fR max_dirty_data (default="5120") \fB\-o\fR max_dirty_data (default="5120")
Flush dirty data to S3 after a certain number of MB written. Flush dirty data to S3 after a certain number of MB written.
The minimum value is 50 MB. -1 value means disable. The minimum value is 50 MB. -1 value means disable.
Cannot be used with nomixupload. Cannot be used with nomixupload.
.TP .TP
\fB\-o\fR ensure_diskfree (default 0) \fB\-o\fR ensure_diskfree (default 0)
sets MB to ensure disk free space. This option means the threshold of free space size on disk which is used for the cache file by s3fs. sets MB to ensure disk free space. This option means the threshold of free space size on disk which is used for the cache file by s3fs.
s3fs makes file for downloading, uploading and caching files. s3fs makes file for downloading, uploading and caching files.
If the disk free space is smaller than this value, s3fs do not use diskspace as possible in exchange for the performance. If the disk free space is smaller than this value, s3fs do not use disk space as possible in exchange for the performance.
.TP .TP
\fB\-o\fR multipart_threshold (default="25") \fB\-o\fR multipart_threshold (default="25")
threshold, in MB, to use multipart upload instead of threshold, in MB, to use multipart upload instead of
single-part. Must be at least 5 MB. single-part. Must be at least 5 MB.
.TP .TP
\fB\-o\fR singlepart_copy_limit (default="512") \fB\-o\fR singlepart_copy_limit (default="512")
maximum size, in MB, of a single-part copy before trying maximum size, in MB, of a single-part copy before trying
@ -253,7 +253,7 @@ In the opposite case s3fs allows access to all users as the default.
But if you set the allow_other with this option, you can control the permissions of the mount point by this option like umask. But if you set the allow_other with this option, you can control the permissions of the mount point by this option like umask.
.TP .TP
\fB\-o\fR umask (default is "0000") \fB\-o\fR umask (default is "0000")
sets umask for files under the mountpoint. This can allow sets umask for files under the mountpoint. This can allow
users other than the mounting user to read and write to files users other than the mounting user to read and write to files
that they did not create. that they did not create.
.TP .TP
@ -264,7 +264,7 @@ Allow S3 server to check data integrity of uploads via the Content-MD5 header.
This can add CPU overhead to transfers. This can add CPU overhead to transfers.
\fB\-o\fR enable_unsigned_payload (default is disable) \fB\-o\fR enable_unsigned_payload (default is disable)
Do not calculate Content-SHA256 for PutObject and UploadPart Do not calculate Content-SHA256 for PutObject and UploadPart
payloads. This can reduce CPU overhead to transfers. payloads. This can reduce CPU overhead to transfers.
.TP .TP
\fB\-o\fR ecs (default is disable) \fB\-o\fR ecs (default is disable)
This option instructs s3fs to query the ECS container credential metadata address instead of the instance metadata address. This option instructs s3fs to query the ECS container credential metadata address instead of the instance metadata address.
@ -274,7 +274,7 @@ This option requires the IAM role name or "auto". If you specify "auto", s3fs wi
.TP .TP
\fB\-o\fR imdsv1only (default is to use IMDSv2 with fallback to v1) \fB\-o\fR imdsv1only (default is to use IMDSv2 with fallback to v1)
AWS instance metadata service, used with IAM role authentication, AWS instance metadata service, used with IAM role authentication,
supports the use of an API token. If you're using an IAM role in an supports the use of an API token. If you're using an IAM role in an
environment that does not support IMDSv2, setting this flag will skip environment that does not support IMDSv2, setting this flag will skip
retrieval and usage of the API token when retrieving IAM credentials. retrieval and usage of the API token when retrieving IAM credentials.
.TP .TP
@ -404,7 +404,7 @@ It can be specified as year, month, day, hour, minute, second, and it is express
For example, "1Y6M10D12h30m30s". For example, "1Y6M10D12h30m30s".
.SH FUSE/MOUNT OPTIONS .SH FUSE/MOUNT OPTIONS
.TP .TP
Most of the generic mount options described in 'man mount' are supported (ro, rw, suid, nosuid, dev, nodev, exec, noexec, atime, noatime, sync async, dirsync). Filesystems are mounted with '\-onodev,nosuid' by default, which can only be overridden by a privileged user. Most of the generic mount options described in 'man mount' are supported (ro, rw, suid, nosuid, dev, nodev, exec, noexec, atime, noatime, sync async, dirsync). Filesystems are mounted with '\-onodev,nosuid' by default, which can only be overridden by a privileged user.
.TP .TP
There are many FUSE specific mount options that can be specified. e.g. allow_other. See the FUSE README for the full set. There are many FUSE specific mount options that can be specified. e.g. allow_other. See the FUSE README for the full set.
.SH LOCAL STORAGE CONSUMPTION .SH LOCAL STORAGE CONSUMPTION

30
src/s3fs_help.cpp
View File

@ -10,7 +10,7 @@
* *
* This program is distributed in the hope that it will be useful, * This program is distributed in the hope that it will be useful,
* but WITHOUT ANY WARRANTY; without even the implied warranty of * but WITHOUT ANY WARRANTY; without even the implied warranty of
* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
* GNU General Public License for more details. * GNU General Public License for more details.
* *
* You should have received a copy of the GNU General Public License * You should have received a copy of the GNU General Public License
@ -63,9 +63,9 @@ static const char help_string[] =
"\n" "\n"
" default_acl (default=\"private\")\n" " default_acl (default=\"private\")\n"
" - the default canned acl to apply to all written s3 objects,\n" " - the default canned acl to apply to all written s3 objects,\n"
" e.g., private, public-read. see\n" " e.g., private, public-read. see\n"
" https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl\n" " https://docs.aws.amazon.com/AmazonS3/latest/dev/acl-overview.html#canned-acl\n"
" for the full list of canned acls\n" " for the full list of canned ACLs\n"
"\n" "\n"
" retries (default=\"5\")\n" " retries (default=\"5\")\n"
" - number of times to retry a failed S3 transaction\n" " - number of times to retry a failed S3 transaction\n"
@ -85,7 +85,7 @@ static const char help_string[] =
" - delete local file cache when s3fs starts and exits.\n" " - delete local file cache when s3fs starts and exits.\n"
"\n" "\n"
" storage_class (default=\"standard\")\n" " storage_class (default=\"standard\")\n"
" - store object with specified storage class. Possible values:\n" " - store object with specified storage class. Possible values:\n"
" standard, standard_ia, onezone_ia, reduced_redundancy,\n" " standard, standard_ia, onezone_ia, reduced_redundancy,\n"
" intelligent_tiering, glacier, and deep_archive.\n" " intelligent_tiering, glacier, and deep_archive.\n"
"\n" "\n"
@ -252,20 +252,20 @@ static const char help_string[] =
"\n" "\n"
" max_dirty_data (default=\"5120\")\n" " max_dirty_data (default=\"5120\")\n"
" - flush dirty data to S3 after a certain number of MB written.\n" " - flush dirty data to S3 after a certain number of MB written.\n"
" The minimum value is 50 MB. -1 value means disable.\n" " The minimum value is 50 MB. -1 value means disable.\n"
" Cannot be used with nomixupload.\n" " Cannot be used with nomixupload.\n"
"\n" "\n"
" ensure_diskfree (default 0)\n" " ensure_diskfree (default 0)\n"
" - sets MB to ensure disk free space. This option means the\n" " - sets MB to ensure disk free space. This option means the\n"
" threshold of free space size on disk which is used for the\n" " threshold of free space size on disk which is used for the\n"
" cache file by s3fs. s3fs makes file for\n" " cache file by s3fs. s3fs makes file for\n"
" downloading, uploading and caching files. If the disk free\n" " downloading, uploading and caching files. If the disk free\n"
" space is smaller than this value, s3fs do not use diskspace\n" " space is smaller than this value, s3fs do not use disk space\n"
" as possible in exchange for the performance.\n" " as possible in exchange for the performance.\n"
"\n" "\n"
" multipart_threshold (default=\"25\")\n" " multipart_threshold (default=\"25\")\n"
" - threshold, in MB, to use multipart upload instead of\n" " - threshold, in MB, to use multipart upload instead of\n"
" single-part. Must be at least 5 MB.\n" " single-part. Must be at least 5 MB.\n"
"\n" "\n"
" singlepart_copy_limit (default=\"512\")\n" " singlepart_copy_limit (default=\"512\")\n"
" - maximum size, in MB, of a single-part copy before trying \n" " - maximum size, in MB, of a single-part copy before trying \n"
@ -308,7 +308,7 @@ static const char help_string[] =
" mount point by this option like umask.\n" " mount point by this option like umask.\n"
"\n" "\n"
" umask (default is \"0000\")\n" " umask (default is \"0000\")\n"
" - sets umask for files under the mountpoint. This can allow\n" " - sets umask for files under the mountpoint. This can allow\n"
" users other than the mounting user to read and write to files\n" " users other than the mounting user to read and write to files\n"
" that they did not create.\n" " that they did not create.\n"
"\n" "\n"
@ -316,11 +316,11 @@ static const char help_string[] =
"\n" "\n"
" enable_content_md5 (default is disable)\n" " enable_content_md5 (default is disable)\n"
" - Allow S3 server to check data integrity of uploads via the\n" " - Allow S3 server to check data integrity of uploads via the\n"
" Content-MD5 header. This can add CPU overhead to transfers.\n" " Content-MD5 header. This can add CPU overhead to transfers.\n"
"\n" "\n"
" enable_unsigned_payload (default is disable)\n" " enable_unsigned_payload (default is disable)\n"
" - Do not calculate Content-SHA256 for PutObject and UploadPart\n" " - Do not calculate Content-SHA256 for PutObject and UploadPart\n"
" payloads. This can reduce CPU overhead to transfers.\n" " payloads. This can reduce CPU overhead to transfers.\n"
"\n" "\n"
" ecs (default is disable)\n" " ecs (default is disable)\n"
" - This option instructs s3fs to query the ECS container credential\n" " - This option instructs s3fs to query the ECS container credential\n"
@ -334,7 +334,7 @@ static const char help_string[] =
"\n" "\n"
" imdsv1only (default is to use IMDSv2 with fallback to v1)\n" " imdsv1only (default is to use IMDSv2 with fallback to v1)\n"
" - AWS instance metadata service, used with IAM role authentication,\n" " - AWS instance metadata service, used with IAM role authentication,\n"
" supports the use of an API token. If you're using an IAM role\n" " supports the use of an API token. If you're using an IAM role\n"
" in an environment that does not support IMDSv2, setting this flag\n" " in an environment that does not support IMDSv2, setting this flag\n"
" will skip retrieval and usage of the API token when retrieving\n" " will skip retrieval and usage of the API token when retrieving\n"
" IAM credentials.\n" " IAM credentials.\n"
@ -474,7 +474,7 @@ static const char help_string[] =
" (error), warn (warning), info (information) to debug level.\n" " (error), warn (warning), info (information) to debug level.\n"
" default debug level is critical. If s3fs run with \"-d\" option,\n" " default debug level is critical. If s3fs run with \"-d\" option,\n"
" the debug level is set information. When s3fs catch the signal\n" " the debug level is set information. When s3fs catch the signal\n"
" SIGUSR2, the debug level is bumpup.\n" " SIGUSR2, the debug level is bump up.\n"
"\n" "\n"
" curldbg - put curl debug message\n" " curldbg - put curl debug message\n"
" Put the debug message from libcurl when this option is specified.\n" " Put the debug message from libcurl when this option is specified.\n"
@ -503,7 +503,7 @@ static const char help_string[] =
"\n" "\n"
" Most of the generic mount options described in 'man mount' are\n" " Most of the generic mount options described in 'man mount' are\n"
" supported (ro, rw, suid, nosuid, dev, nodev, exec, noexec, atime,\n" " supported (ro, rw, suid, nosuid, dev, nodev, exec, noexec, atime,\n"
" noatime, sync async, dirsync). Filesystems are mounted with\n" " noatime, sync async, dirsync). Filesystems are mounted with\n"
" '-onodev,nosuid' by default, which can only be overridden by a\n" " '-onodev,nosuid' by default, which can only be overridden by a\n"
" privileged user.\n" " privileged user.\n"
" \n" " \n"

2
test/integration-test-main.sh
View File

@ -1588,7 +1588,7 @@ function test_mix_upload_entities() {
# line for the ENSURE_DISKFREE_SIZE variable) # line for the ENSURE_DISKFREE_SIZE variable)
# #
function test_ensurespace_move_file() { function test_ensurespace_move_file() {
describe "Testing upload(mv) file when diskspace is not enough ..." describe "Testing upload(mv) file when disk space is not enough ..."
# #
# Make test file which is not under mountpoint # Make test file which is not under mountpoint