From bd27294ab0b02527c0863a8cc8ff94efcc9ffe84 Mon Sep 17 00:00:00 2001 From: Takeshi Nakatani Date: Sun, 12 Apr 2015 02:04:13 +0000 Subject: [PATCH] Increased default connecting/reading/writing timeout value --- doc/man/s3fs.1 | 4 ++-- src/curl.cpp | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/doc/man/s3fs.1 b/doc/man/s3fs.1 index 3c22ecd..be7bb1f 100644 --- a/doc/man/s3fs.1 +++ b/doc/man/s3fs.1 @@ -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) anonymously mount a public bucket when set to 1, ignores the $HOME/.passwd-s3fs and /etc/passwd-s3fs files. .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. .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. .TP \fB\-o\fR max_stat_cache_size (default="1000" entries (about 4MB)) diff --git a/src/curl.cpp b/src/curl.cpp index 8fa8d0f..2bc370e 100644 --- a/src/curl.cpp +++ b/src/curl.cpp @@ -243,8 +243,8 @@ bool S3fsCurl::is_initglobal_done = false; CURLSH* S3fsCurl::hCurlShare = NULL; bool S3fsCurl::is_dns_cache = true; // default bool S3fsCurl::is_ssl_session_cache= true; // default -long S3fsCurl::connect_timeout = 10; // default -time_t S3fsCurl::readwrite_timeout = 30; // default +long S3fsCurl::connect_timeout = 300; // default +time_t S3fsCurl::readwrite_timeout = 60; // default int S3fsCurl::retries = 3; // default bool S3fsCurl::is_public_bucket = false; string S3fsCurl::default_acl = "private";