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

Merge pull request #167 from s3fs-fuse/timeoutbranch

Browse Source 
Increased default connecting/reading/writing timeout value
This commit is contained in:
Takeshi Nakatani 2015-04-12 11:18:52 +09:00
commit 07e007052a
2 changed files with 4 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
doc/man/s3fs.1
View File

@ -100,10 +100,10 @@ If you specify this option for set "Content-Encoding" HTTP header, please take c
\fB\-o\fR public_bucket (default="" which means disabled) \fB\-o\fR public_bucket (default="" which means disabled)
anonymously mount a public bucket when set to 1, ignores the $HOME/.passwd-s3fs and /etc/passwd-s3fs files. anonymously mount a public bucket when set to 1, ignores the $HOME/.passwd-s3fs and /etc/passwd-s3fs files.
.TP .TP
\fB\-o\fR connect_timeout (default="10" seconds) \fB\-o\fR connect_timeout (default="300" seconds)
time to wait for connection before giving up. time to wait for connection before giving up.
.TP .TP
\fB\-o\fR readwrite_timeout (default="30" seconds) \fB\-o\fR readwrite_timeout (default="60" seconds)
time to wait between read/write activity before giving up. time to wait between read/write activity before giving up.
.TP .TP
\fB\-o\fR max_stat_cache_size (default="1000" entries (about 4MB)) \fB\-o\fR max_stat_cache_size (default="1000" entries (about 4MB))

4
src/curl.cpp
View File

@ -243,8 +243,8 @@ bool S3fsCurl::is_initglobal_done = false;
CURLSH* S3fsCurl::hCurlShare = NULL; CURLSH* S3fsCurl::hCurlShare = NULL;
bool S3fsCurl::is_dns_cache = true; // default bool S3fsCurl::is_dns_cache = true; // default
bool S3fsCurl::is_ssl_session_cache= true; // default bool S3fsCurl::is_ssl_session_cache= true; // default
long S3fsCurl::connect_timeout = 10; // default long S3fsCurl::connect_timeout = 300; // default
time_t S3fsCurl::readwrite_timeout = 30; // default time_t S3fsCurl::readwrite_timeout = 60; // default
int S3fsCurl::retries = 3; // default int S3fsCurl::retries = 3; // default
bool S3fsCurl::is_public_bucket = false; bool S3fsCurl::is_public_bucket = false;
string S3fsCurl::default_acl = "private"; string S3fsCurl::default_acl = "private";