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

fix: Add reset offset (#1503)

Browse Source
This commit is contained in:
fly3366 2021-01-04 21:57:56 +08:00 committed by GitHub
parent 7158e50ee2
commit 168e588ac7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 39 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/curl.cpp
View File

@ -723,6 +723,12 @@ bool S3fsCurl::SetDnsCache(bool isCache)
return old; return old;
} }
void S3fsCurl::ResetOffset(S3fsCurl* pCurl)
{
pCurl->partdata.startpos = pCurl->b_partdata_startpos;
pCurl->partdata.size = pCurl->b_partdata_size;
}
bool S3fsCurl::SetSslSessionCache(bool isCache) bool S3fsCurl::SetSslSessionCache(bool isCache)
{ {
bool old = S3fsCurl::is_ssl_session_cache; bool old = S3fsCurl::is_ssl_session_cache;
@ -1465,6 +1471,7 @@ S3fsCurl* S3fsCurl::ParallelGetObjectRetryCallback(S3fsCurl* s3fscurl)
// duplicate request(setup new curl object) // duplicate request(setup new curl object)
S3fsCurl* newcurl = new S3fsCurl(s3fscurl->IsUseAhbe()); S3fsCurl* newcurl = new S3fsCurl(s3fscurl->IsUseAhbe());
if(0 != (result = newcurl->PreGetObjectRequest(s3fscurl->path.c_str(), s3fscurl->partdata.fd, s3fscurl->partdata.startpos, s3fscurl->partdata.size, s3fscurl->b_ssetype, s3fscurl->b_ssevalue))){ if(0 != (result = newcurl->PreGetObjectRequest(s3fscurl->path.c_str(), s3fscurl->partdata.fd, s3fscurl->partdata.startpos, s3fscurl->partdata.size, s3fscurl->b_ssetype, s3fscurl->b_ssevalue))){
S3FS_PRN_ERR("failed downloading part setup(%d)", result); S3FS_PRN_ERR("failed downloading part setup(%d)", result);
delete newcurl; delete newcurl;
@ -2244,7 +2251,7 @@ int S3fsCurl::RequestPerform(bool dontAddAuthHeaders /*=false*/)
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders); curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
// Requests // Requests
CURLcode curlCode = curl_easy_perform(hCurl); curlCode = curl_easy_perform(hCurl);
// Check result // Check result
switch(curlCode){ switch(curlCode){

5
src/curl.h
View File

@ -198,7 +198,8 @@ class S3fsCurl
pthread_mutex_t *completed_tids_lock; pthread_mutex_t *completed_tids_lock;
std::vector<pthread_t> *completed_tids; std::vector<pthread_t> *completed_tids;
s3fscurl_lazy_setup fpLazySetup; // curl options for lazy setting function s3fscurl_lazy_setup fpLazySetup; // curl options for lazy setting function
CURLcode curlCode; // handle curl return
public: public:
static const long S3FSCURL_RESPONSECODE_NOTSET = -1; static const long S3FSCURL_RESPONSECODE_NOTSET = -1;
static const long S3FSCURL_RESPONSECODE_FATAL_ERROR = -2; static const long S3FSCURL_RESPONSECODE_FATAL_ERROR = -2;
@ -333,6 +334,7 @@ class S3fsCurl
} }
static long SetSslVerifyHostname(long value); static long SetSslVerifyHostname(long value);
static long GetSslVerifyHostname() { return S3fsCurl::ssl_verify_hostname; } static long GetSslVerifyHostname() { return S3fsCurl::ssl_verify_hostname; }
static void ResetOffset(S3fsCurl* pCurl);
// maximum parallel GET and PUT requests // maximum parallel GET and PUT requests
static int SetMaxParallelCount(int value); static int SetMaxParallelCount(int value);
static int GetMaxParallelCount() { return S3fsCurl::max_parallel_cnt; } static int GetMaxParallelCount() { return S3fsCurl::max_parallel_cnt; }
@ -398,6 +400,7 @@ class S3fsCurl
headers_t* GetResponseHeaders() { return &responseHeaders; } headers_t* GetResponseHeaders() { return &responseHeaders; }
BodyData* GetBodyData() { return &bodydata; } BodyData* GetBodyData() { return &bodydata; }
BodyData* GetHeadData() { return &headdata; } BodyData* GetHeadData() { return &headdata; }
CURLcode GetCurlCode() const { return curlCode; }
long GetLastResponseCode() const { return LastResponseCode; } long GetLastResponseCode() const { return LastResponseCode; }
bool SetUseAhbe(bool ahbe); bool SetUseAhbe(bool ahbe);
bool EnableUseAhbe() { return SetUseAhbe(true); } bool EnableUseAhbe() { return SetUseAhbe(true); }

29
src/curl_multi.cpp
View File

@ -186,8 +186,11 @@ int S3fsMultiCurl::MultiRead()
bool isRetry = false; bool isRetry = false;
bool isPostpone = false; bool isPostpone = false;
bool isNeedResetOffset = true;
long responseCode = S3fsCurl::S3FSCURL_RESPONSECODE_NOTSET; long responseCode = S3fsCurl::S3FSCURL_RESPONSECODE_NOTSET;
if(s3fscurl->GetResponseCode(responseCode, false)){ CURLcode curlCode = s3fscurl->GetCurlCode();
if(s3fscurl->GetResponseCode(responseCode, false) && curlCode == CURLE_OK){
if(S3fsCurl::S3FSCURL_RESPONSECODE_NOTSET == responseCode){ if(S3fsCurl::S3FSCURL_RESPONSECODE_NOTSET == responseCode){
// This is a case where the processing result has not yet been updated (should be very rare). // This is a case where the processing result has not yet been updated (should be very rare).
isPostpone = true; isPostpone = true;
@ -219,6 +222,23 @@ int S3fsMultiCurl::MultiRead()
} }
}else{ }else{
S3FS_PRN_ERR("failed a request(Unknown response code: %s)", s3fscurl->url.c_str()); S3FS_PRN_ERR("failed a request(Unknown response code: %s)", s3fscurl->url.c_str());
// Reuse partical file
switch(curlCode){
case CURLE_OPERATION_TIMEDOUT:
isRetry = true;
isNeedResetOffset = false;
break;
case CURLE_PARTIAL_FILE:
isRetry = true;
isNeedResetOffset = false;
break;
default:
S3FS_PRN_ERR("###curlCode: %d msg: %s", curlCode, curl_easy_strerror(curlCode));
isRetry = true;
break;
}
} }
if(isPostpone){ if(isPostpone){
@ -233,7 +253,12 @@ int S3fsMultiCurl::MultiRead()
delete s3fscurl; delete s3fscurl;
}else{ }else{
S3fsCurl* retrycurl = NULL; S3fsCurl* retrycurl = NULL;
// Reset offset
if(isNeedResetOffset){
S3fsCurl::ResetOffset(s3fscurl);
}
// For retry // For retry
if(RetryCallback){ if(RetryCallback){
retrycurl = RetryCallback(s3fscurl); retrycurl = RetryCallback(s3fscurl);