From 7d14ebaf09ecd0ac2b8efe1b7a4b8e326183f091 Mon Sep 17 00:00:00 2001 From: Andrew Gaul Date: Fri, 25 Jan 2019 14:22:23 -0800 Subject: [PATCH] Correct enable_content_md5 docs Both S3fsCurl::PutRequest and S3fsCurl::UploadMultipartPostSetup can calculate and send Content-MD5 to the server. Remove spurious comment about large files and make man page and help consistent. References #929. --- doc/man/s3fs.1 | 6 ++---- src/s3fs_util.cpp | 3 ++- 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/doc/man/s3fs.1 b/doc/man/s3fs.1 index 0412d58..49a1bc8 100644 --- a/doc/man/s3fs.1 +++ b/doc/man/s3fs.1 @@ -220,10 +220,8 @@ But if you set the allow_other with this option, you can control permissions of \fB\-o\fR nomultipart - disable multipart uploads .TP \fB\-o\fR enable_content_md5 ( default is disable ) -verifying uploaded data without multipart by content-md5 header. -Enable to send "Content-MD5" header when uploading a object without multipart posting. -If this option is enabled, it has some influences on a performance of s3fs when uploading small object. -Because s3fs always checks MD5 when uploading large object, this option does not affect on large object. +Allow S3 server to check data integrity of uploads via the Content-MD5 header. +This can add CPU overhead to transfers. .TP \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. diff --git a/src/s3fs_util.cpp b/src/s3fs_util.cpp index aef556d..d7e6f19 100644 --- a/src/s3fs_util.cpp +++ b/src/s3fs_util.cpp @@ -1231,7 +1231,8 @@ void show_help (void) " nomultipart (disable multipart uploads)\n" "\n" " enable_content_md5 (default is disable)\n" - " - ensure data integrity during writes with MD5 hash.\n" + " Allow S3 server to check data integrity of uploads via the\n" + " Content-MD5 header. This can add CPU overhead to transfers.\n" "\n" " ecs\n" " - This option instructs s3fs to query the ECS container credential\n"