Merge pull request #184 from andrewgaul/multipart-size

Add usage information for multipart_size
This commit is contained in:
Takeshi Nakatani 2015-05-06 22:36:37 +09:00
commit 91587ad2c8
2 changed files with 4 additions and 1 deletions

View File

@ -3867,7 +3867,7 @@ static int my_fuse_opt_proc(void* data, const char* arg, int key, struct fuse_ar
if(0 == STR2NCMP(arg, "multipart_size=")){ if(0 == STR2NCMP(arg, "multipart_size=")){
off_t size = static_cast<off_t>(s3fs_strtoofft(strchr(arg, '=') + sizeof(char))); off_t size = static_cast<off_t>(s3fs_strtoofft(strchr(arg, '=') + sizeof(char)));
if(!S3fsCurl::SetMultipartSize(size)){ if(!S3fsCurl::SetMultipartSize(size)){
fprintf(stderr, "%s: multipart_size option could not be specified over 10(MB)\n", program_name.c_str()); fprintf(stderr, "%s: multipart_size option must be at least 10 MB\n", program_name.c_str());
return -1; return -1;
} }
if(FdManager::GetPageSize() < static_cast<size_t>(S3fsCurl::GetMultipartSize() * S3fsCurl::GetMaxParallelCount())){ if(FdManager::GetPageSize() < static_cast<size_t>(S3fsCurl::GetMultipartSize() * S3fsCurl::GetMaxParallelCount())){

View File

@ -965,6 +965,9 @@ void show_help (void)
" at once. It is necessary to set this value depending on a CPU \n" " at once. It is necessary to set this value depending on a CPU \n"
" and a network band.\n" " and a network band.\n"
"\n" "\n"
" multipart_size (default=\"10\")\n"
" - part size, in MB, for each multipart request.\n"
"\n"
" fd_page_size (default=\"52428800\"(50MB))\n" " fd_page_size (default=\"52428800\"(50MB))\n"
" - number of internal management page size for each file discriptor.\n" " - number of internal management page size for each file discriptor.\n"
" For delayed reading and writing by s3fs, s3fs manages pages which \n" " For delayed reading and writing by s3fs, s3fs manages pages which \n"