mirror of
https://github.com/s3fs-fuse/s3fs-fuse.git
synced 2024-06-07 11:30:49 +00:00
Fixed a bug(about retry request)
1) Fixed a bug s3fs was wrong for request retry processing so far. It was fixed. Probably, Issue 343(1.7 having curl 35 + other disconnect issue) is occurred by this bug. git-svn-id: http://s3fs.googlecode.com/svn/trunk@468 df820570-a93a-0410-bd06-b72b767a4274
This commit is contained in:
ggtakec@gmail.com
parent
7fa1e37a28
commit
171de649ef
290
src/curl.cpp
290
src/curl.cpp
|
|
@ -892,8 +892,9 @@ int S3fsCurl::ParallelGetObjectRequest(const char* tpath, int fd, off_t start, s
|
|||
// Methods for S3fsCurl
|
||||
//-------------------------------------------------------------------
|
||||
S3fsCurl::S3fsCurl(bool ahbe) :
|
||||
hCurl(NULL), path(""), base_path(""), saved_path(""), url(""), requestHeaders(NULL), bodydata(NULL),
|
||||
headdata(NULL), LastResponseCode(-1), postdata(NULL), postdata_remaining(0), is_use_ahbe(ahbe)
|
||||
type(REQTYPE_UNSET), hCurl(NULL), path(""), base_path(""), saved_path(""), url(""), requestHeaders(NULL),
|
||||
bodydata(NULL), headdata(NULL), LastResponseCode(-1), postdata(NULL), postdata_remaining(0), is_use_ahbe(ahbe),
|
||||
b_infile(NULL), b_postdata(NULL), b_postdata_remaining(0), b_partdata_startpos(0), b_partdata_size(0)
|
||||
{
|
||||
}
|
||||
|
||||
|
|
@ -902,6 +903,33 @@ S3fsCurl::~S3fsCurl()
|
|||
DestroyCurlHandle();
|
||||
}
|
||||
|
||||
bool S3fsCurl::ResetHandle(void)
|
||||
{
|
||||
curl_easy_reset(hCurl);
|
||||
curl_easy_setopt(hCurl, CURLOPT_NOSIGNAL, 1);
|
||||
curl_easy_setopt(hCurl, CURLOPT_FOLLOWLOCATION, true);
|
||||
curl_easy_setopt(hCurl, CURLOPT_CONNECTTIMEOUT, S3fsCurl::connect_timeout);
|
||||
curl_easy_setopt(hCurl, CURLOPT_NOPROGRESS, 0);
|
||||
curl_easy_setopt(hCurl, CURLOPT_PROGRESSFUNCTION, S3fsCurl::CurlProgress);
|
||||
curl_easy_setopt(hCurl, CURLOPT_PROGRESSDATA, hCurl);
|
||||
// curl_easy_setopt(hCurl, CURLOPT_FORBID_REUSE, 1);
|
||||
|
||||
if(0 == S3fsCurl::ssl_verify_hostname){
|
||||
curl_easy_setopt(hCurl, CURLOPT_SSL_VERIFYHOST, 0);
|
||||
}
|
||||
if(S3fsCurl::curl_ca_bundle.size() != 0){
|
||||
curl_easy_setopt(hCurl, CURLOPT_CAINFO, S3fsCurl::curl_ca_bundle.c_str());
|
||||
}
|
||||
if(S3fsCurl::is_dns_cache && S3fsCurl::hCurlShare){
|
||||
curl_easy_setopt(hCurl, CURLOPT_SHARE, S3fsCurl::hCurlShare);
|
||||
}
|
||||
|
||||
S3fsCurl::curl_times[hCurl] = time(0);
|
||||
S3fsCurl::curl_progress[hCurl] = progress_t(-1, -1);
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
bool S3fsCurl::CreateCurlHandle(bool force)
|
||||
{
|
||||
pthread_mutex_lock(&S3fsCurl::curl_handles_lock);
|
||||
|
|
@ -923,27 +951,8 @@ bool S3fsCurl::CreateCurlHandle(bool force)
|
|||
DPRN("Failed to create handle.");
|
||||
return false;
|
||||
}
|
||||
curl_easy_reset(hCurl);
|
||||
curl_easy_setopt(hCurl, CURLOPT_NOSIGNAL, 1);
|
||||
curl_easy_setopt(hCurl, CURLOPT_FOLLOWLOCATION, true);
|
||||
curl_easy_setopt(hCurl, CURLOPT_CONNECTTIMEOUT, S3fsCurl::connect_timeout);
|
||||
curl_easy_setopt(hCurl, CURLOPT_NOPROGRESS, 0);
|
||||
curl_easy_setopt(hCurl, CURLOPT_PROGRESSFUNCTION, S3fsCurl::CurlProgress);
|
||||
curl_easy_setopt(hCurl, CURLOPT_PROGRESSDATA, hCurl);
|
||||
// curl_easy_setopt(hCurl, CURLOPT_FORBID_REUSE, 1);
|
||||
|
||||
if(0 == S3fsCurl::ssl_verify_hostname){
|
||||
curl_easy_setopt(hCurl, CURLOPT_SSL_VERIFYHOST, 0);
|
||||
}
|
||||
if(S3fsCurl::curl_ca_bundle.size() != 0){
|
||||
curl_easy_setopt(hCurl, CURLOPT_CAINFO, S3fsCurl::curl_ca_bundle.c_str());
|
||||
}
|
||||
if(S3fsCurl::is_dns_cache && S3fsCurl::hCurlShare){
|
||||
curl_easy_setopt(hCurl, CURLOPT_SHARE, S3fsCurl::hCurlShare);
|
||||
}
|
||||
|
||||
S3fsCurl::curl_times[hCurl] = time(0);
|
||||
S3fsCurl::curl_progress[hCurl] = progress_t(-1, -1);
|
||||
type = REQTYPE_UNSET;
|
||||
ResetHandle();
|
||||
|
||||
pthread_mutex_unlock(&S3fsCurl::curl_handles_lock);
|
||||
|
||||
|
|
@ -972,6 +981,7 @@ bool S3fsCurl::ClearInternalData(void)
|
|||
if(hCurl){
|
||||
return false;
|
||||
}
|
||||
type = REQTYPE_UNSET;
|
||||
path = "";
|
||||
base_path = "";
|
||||
saved_path= "";
|
||||
|
|
@ -989,7 +999,14 @@ bool S3fsCurl::ClearInternalData(void)
|
|||
delete headdata;
|
||||
headdata = NULL;
|
||||
}
|
||||
LastResponseCode = -1;
|
||||
LastResponseCode = -1;
|
||||
postdata = NULL;
|
||||
postdata_remaining = 0;
|
||||
b_infile = NULL;
|
||||
b_postdata = NULL;
|
||||
b_postdata_remaining = 0;
|
||||
b_partdata_startpos = 0;
|
||||
b_partdata_size = 0;
|
||||
partdata.clear();
|
||||
|
||||
return true;
|
||||
|
|
@ -1015,10 +1032,171 @@ bool S3fsCurl::GetResponseCode(long& responseCode)
|
|||
return true;
|
||||
}
|
||||
|
||||
//
|
||||
// Reset all options for retrying
|
||||
//
|
||||
bool S3fsCurl::RemakeHandle(void)
|
||||
{
|
||||
DPRNNN("Retry request. [type=%d][url=%s][path=%s]", type, url.c_str(), path.c_str());
|
||||
|
||||
if(REQTYPE_UNSET == type){
|
||||
return false;
|
||||
}
|
||||
|
||||
// rewind file
|
||||
struct stat st;
|
||||
if(b_infile){
|
||||
rewind(b_infile);
|
||||
if(-1 == fstat(fileno(b_infile), &st)){
|
||||
DPRNNN("Could not get file stat(fd=%d)", fileno(b_infile));
|
||||
return false;
|
||||
}
|
||||
}
|
||||
|
||||
// reinitialize internal data
|
||||
responseHeaders.clear();
|
||||
if(bodydata){
|
||||
bodydata->Clear();
|
||||
}
|
||||
if(headdata){
|
||||
headdata->Clear();
|
||||
}
|
||||
LastResponseCode = -1;
|
||||
|
||||
// set from backup
|
||||
postdata = b_postdata;
|
||||
postdata_remaining = b_postdata_remaining;
|
||||
partdata.startpos = b_partdata_startpos;
|
||||
partdata.size = b_partdata_size;
|
||||
|
||||
// reset handle
|
||||
ResetHandle();
|
||||
|
||||
// set options
|
||||
switch(type){
|
||||
case REQTYPE_DELETE:
|
||||
curl_easy_setopt(hCurl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(hCurl, CURLOPT_CUSTOMREQUEST, "DELETE");
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
break;
|
||||
|
||||
case REQTYPE_HEAD:
|
||||
curl_easy_setopt(hCurl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(hCurl, CURLOPT_NOBODY, true);
|
||||
curl_easy_setopt(hCurl, CURLOPT_FILETIME, true);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
// responseHeaders
|
||||
curl_easy_setopt(hCurl, CURLOPT_HEADERDATA, (void*)&responseHeaders);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HEADERFUNCTION, HeaderCallback);
|
||||
break;
|
||||
|
||||
case REQTYPE_PUTHEAD:
|
||||
curl_easy_setopt(hCurl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(hCurl, CURLOPT_UPLOAD, true);
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEDATA, (void*)bodydata);
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
|
||||
curl_easy_setopt(hCurl, CURLOPT_INFILESIZE, 0);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
break;
|
||||
|
||||
case REQTYPE_PUT:
|
||||
curl_easy_setopt(hCurl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(hCurl, CURLOPT_UPLOAD, true);
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEDATA, (void*)bodydata);
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
if(b_infile){
|
||||
curl_easy_setopt(hCurl, CURLOPT_INFILESIZE_LARGE, static_cast<curl_off_t>(st.st_size));
|
||||
curl_easy_setopt(hCurl, CURLOPT_INFILE, b_infile);
|
||||
}else{
|
||||
curl_easy_setopt(hCurl, CURLOPT_INFILESIZE, 0);
|
||||
}
|
||||
break;
|
||||
|
||||
case REQTYPE_GET:
|
||||
curl_easy_setopt(hCurl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEFUNCTION, S3fsCurl::DownloadWriteCallback);
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEDATA, (void*)this);
|
||||
break;
|
||||
|
||||
case REQTYPE_CHKBUCKET:
|
||||
curl_easy_setopt(hCurl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(hCurl, CURLOPT_FAILONERROR, true);
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEDATA, (void*)bodydata);
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
break;
|
||||
|
||||
case REQTYPE_LISTBUCKET:
|
||||
curl_easy_setopt(hCurl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEDATA, (void*)bodydata);
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
break;
|
||||
|
||||
case REQTYPE_PREMULTIPOST:
|
||||
curl_easy_setopt(hCurl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(hCurl, CURLOPT_POST, true);
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEDATA, (void*)bodydata);
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
|
||||
curl_easy_setopt(hCurl, CURLOPT_POSTFIELDSIZE, 0);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
break;
|
||||
|
||||
case REQTYPE_COMPLETEMULTIPOST:
|
||||
curl_easy_setopt(hCurl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
curl_easy_setopt(hCurl, CURLOPT_POST, true);
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEDATA, (void*)bodydata);
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
|
||||
curl_easy_setopt(hCurl, CURLOPT_POSTFIELDSIZE, (curl_off_t)postdata_remaining);
|
||||
curl_easy_setopt(hCurl, CURLOPT_READDATA, (void*)this);
|
||||
curl_easy_setopt(hCurl, CURLOPT_READFUNCTION, S3fsCurl::ReadCallback);
|
||||
break;
|
||||
|
||||
case REQTYPE_UPLOADMULTIPOST:
|
||||
curl_easy_setopt(hCurl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(hCurl, CURLOPT_UPLOAD, true);
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEDATA, (void*)bodydata);
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HEADERDATA, (void*)headdata);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HEADERFUNCTION, WriteMemoryCallback);
|
||||
curl_easy_setopt(hCurl, CURLOPT_INFILESIZE_LARGE, partdata.size);
|
||||
curl_easy_setopt(hCurl, CURLOPT_READFUNCTION, S3fsCurl::UploadReadCallback);
|
||||
curl_easy_setopt(hCurl, CURLOPT_READDATA, (void*)this);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
break;
|
||||
|
||||
case REQTYPE_COPYMULTIPOST:
|
||||
curl_easy_setopt(hCurl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(hCurl, CURLOPT_UPLOAD, true);
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEDATA, (void*)bodydata);
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HEADERDATA, (void*)headdata);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HEADERFUNCTION, WriteMemoryCallback);
|
||||
curl_easy_setopt(hCurl, CURLOPT_INFILESIZE, 0);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
break;
|
||||
|
||||
case REQTYPE_MULTILIST:
|
||||
curl_easy_setopt(hCurl, CURLOPT_URL, url.c_str());
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEDATA, (void*)bodydata);
|
||||
curl_easy_setopt(hCurl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
break;
|
||||
|
||||
default:
|
||||
DPRNNN("request type is unknown(%d)", type);
|
||||
return false;
|
||||
}
|
||||
return true;
|
||||
}
|
||||
|
||||
//
|
||||
// returns curl return code
|
||||
//
|
||||
int S3fsCurl::RequestPerform(FILE* file)
|
||||
int S3fsCurl::RequestPerform(void)
|
||||
{
|
||||
if(debug){
|
||||
char* ptr_url = NULL;
|
||||
|
|
@ -1029,16 +1207,6 @@ int S3fsCurl::RequestPerform(FILE* file)
|
|||
|
||||
// 1 attempt + retries...
|
||||
for(int retrycnt = S3fsCurl::retries; 0 < retrycnt; retrycnt--){
|
||||
if(file){
|
||||
rewind(file);
|
||||
}
|
||||
if(bodydata){
|
||||
bodydata->Clear();
|
||||
}
|
||||
if(headdata){
|
||||
headdata->Clear();
|
||||
}
|
||||
|
||||
// Requests
|
||||
CURLcode curlCode = curl_easy_perform(hCurl);
|
||||
|
||||
|
|
@ -1190,6 +1358,11 @@ int S3fsCurl::RequestPerform(FILE* file)
|
|||
break;
|
||||
}
|
||||
DPRNNN("### retrying...");
|
||||
|
||||
if(!RemakeHandle()){
|
||||
DPRNNN("Failed to reset handle and internal data for retrying.");
|
||||
return -EIO;
|
||||
}
|
||||
}
|
||||
DPRN("### giving up");
|
||||
return -EIO;
|
||||
|
|
@ -1371,6 +1544,8 @@ int S3fsCurl::DeleteRequest(const char* tpath)
|
|||
curl_easy_setopt(hCurl, CURLOPT_CUSTOMREQUEST, "DELETE");
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
|
||||
type = REQTYPE_DELETE;
|
||||
|
||||
return RequestPerform();
|
||||
}
|
||||
|
||||
|
|
@ -1421,6 +1596,8 @@ bool S3fsCurl::PreHeadRequest(const char* tpath, const char* bpath, const char*
|
|||
curl_easy_setopt(hCurl, CURLOPT_HEADERDATA, (void*)&responseHeaders);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HEADERFUNCTION, HeaderCallback);
|
||||
|
||||
type = REQTYPE_HEAD;
|
||||
|
||||
return true;
|
||||
}
|
||||
|
||||
|
|
@ -1533,6 +1710,8 @@ int S3fsCurl::PutHeadRequest(const char* tpath, headers_t& meta, bool ow_sse_flg
|
|||
curl_easy_setopt(hCurl, CURLOPT_INFILESIZE, 0); // Content-Length
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
|
||||
type = REQTYPE_PUTHEAD;
|
||||
|
||||
DPRNNN("copying... [path=%s]", tpath);
|
||||
|
||||
int result = RequestPerform();
|
||||
|
|
@ -1559,6 +1738,7 @@ int S3fsCurl::PutRequest(const char* tpath, headers_t& meta, int fd, bool ow_sse
|
|||
DPRN("Could not duplicate file discriptor(errno=%d)", errno);
|
||||
return -errno;
|
||||
}
|
||||
b_infile = file;
|
||||
}else{
|
||||
// This case is creating zero byte obejct.(calling by create_file_object())
|
||||
DPRNNN("create zero byte file object.");
|
||||
|
|
@ -1638,6 +1818,8 @@ int S3fsCurl::PutRequest(const char* tpath, headers_t& meta, int fd, bool ow_sse
|
|||
curl_easy_setopt(hCurl, CURLOPT_INFILESIZE, 0); // Content-Length: 0
|
||||
}
|
||||
|
||||
type = REQTYPE_PUT;
|
||||
|
||||
DPRNNN("uploading... [path=%s][fd=%d][size=%jd]", tpath, fd, (intmax_t)(-1 != fd ? st.st_size : 0));
|
||||
|
||||
int result = RequestPerform();
|
||||
|
|
@ -1697,9 +1879,13 @@ int S3fsCurl::PreGetObjectRequest(const char* tpath, int fd, off_t start, ssize_
|
|||
// set info for callback func.
|
||||
// (use only fd, startpos and size, other member is not used.)
|
||||
partdata.clear();
|
||||
partdata.fd = fd;
|
||||
partdata.startpos = start;
|
||||
partdata.size = size;
|
||||
partdata.fd = fd;
|
||||
partdata.startpos = start;
|
||||
partdata.size = size;
|
||||
b_partdata_startpos = start;
|
||||
b_partdata_size = size;
|
||||
|
||||
type = REQTYPE_GET;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
|
@ -1759,6 +1945,8 @@ int S3fsCurl::CheckBucket(void)
|
|||
curl_easy_setopt(hCurl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
|
||||
type = REQTYPE_CHKBUCKET;
|
||||
|
||||
int result = RequestPerform();
|
||||
delete bodydata;
|
||||
bodydata = NULL;
|
||||
|
|
@ -1807,6 +1995,8 @@ int S3fsCurl::ListBucketRequest(const char* tpath, const char* query)
|
|||
curl_easy_setopt(hCurl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
|
||||
type = REQTYPE_LISTBUCKET;
|
||||
|
||||
return RequestPerform();
|
||||
}
|
||||
|
||||
|
|
@ -1888,6 +2078,8 @@ int S3fsCurl::PreMultipartPostRequest(const char* tpath, headers_t& meta, string
|
|||
curl_easy_setopt(hCurl, CURLOPT_POSTFIELDSIZE, 0);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
|
||||
type = REQTYPE_PREMULTIPOST;
|
||||
|
||||
// request
|
||||
int result;
|
||||
if(0 != (result = RequestPerform())){
|
||||
|
|
@ -1932,8 +2124,10 @@ int S3fsCurl::CompleteMultipartPostRequest(const char* tpath, string& upload_id,
|
|||
postContent += "</CompleteMultipartUpload>\n";
|
||||
|
||||
// set postdata
|
||||
postdata = reinterpret_cast<const unsigned char*>(postContent.c_str());
|
||||
postdata_remaining = postContent.size(); // without null
|
||||
postdata = reinterpret_cast<const unsigned char*>(postContent.c_str());
|
||||
b_postdata = postdata;
|
||||
postdata_remaining = postContent.size(); // without null
|
||||
b_postdata_remaining = postdata_remaining;
|
||||
|
||||
if(!CreateCurlHandle(true)){
|
||||
return -1;
|
||||
|
|
@ -1972,6 +2166,8 @@ int S3fsCurl::CompleteMultipartPostRequest(const char* tpath, string& upload_id,
|
|||
curl_easy_setopt(hCurl, CURLOPT_READDATA, (void*)this);
|
||||
curl_easy_setopt(hCurl, CURLOPT_READFUNCTION, S3fsCurl::ReadCallback);
|
||||
|
||||
type = REQTYPE_COMPLETEMULTIPOST;
|
||||
|
||||
// request
|
||||
int result = RequestPerform();
|
||||
delete bodydata;
|
||||
|
|
@ -2017,6 +2213,8 @@ int S3fsCurl::MultipartListRequest(string& body)
|
|||
curl_easy_setopt(hCurl, CURLOPT_WRITEFUNCTION, WriteMemoryCallback);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
|
||||
type = REQTYPE_MULTILIST;
|
||||
|
||||
int result;
|
||||
if(0 == (result = RequestPerform()) && 0 < bodydata->size()){
|
||||
body = bodydata->str();
|
||||
|
|
@ -2102,6 +2300,8 @@ int S3fsCurl::UploadMultipartPostSetup(const char* tpath, int part_num, string&
|
|||
curl_easy_setopt(hCurl, CURLOPT_READDATA, (void*)this);
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
|
||||
type = REQTYPE_UPLOADMULTIPOST;
|
||||
|
||||
return 0;
|
||||
}
|
||||
|
||||
|
|
@ -2209,6 +2409,8 @@ int S3fsCurl::CopyMultipartPostRequest(const char* from, const char* to, int par
|
|||
curl_easy_setopt(hCurl, CURLOPT_INFILESIZE, 0); // Content-Length
|
||||
curl_easy_setopt(hCurl, CURLOPT_HTTPHEADER, requestHeaders);
|
||||
|
||||
type = REQTYPE_COPYMULTIPOST;
|
||||
|
||||
// request
|
||||
DPRNNN("copying... [from=%s][to=%s][part=%d]", from, to, part_num);
|
||||
|
||||
|
|
@ -2313,9 +2515,11 @@ int S3fsCurl::MultipartUploadRequest(const char* tpath, headers_t& meta, int fd,
|
|||
chunk = remaining_bytes > MULTIPART_SIZE ? MULTIPART_SIZE : remaining_bytes;
|
||||
|
||||
// set
|
||||
partdata.fd = fd2;
|
||||
partdata.startpos = st.st_size - remaining_bytes;
|
||||
partdata.size = chunk;
|
||||
partdata.fd = fd2;
|
||||
partdata.startpos = st.st_size - remaining_bytes;
|
||||
partdata.size = chunk;
|
||||
b_partdata_startpos = partdata.startpos;
|
||||
b_partdata_size = partdata.size;
|
||||
|
||||
// upload part
|
||||
if(0 != (result = UploadMultipartPostRequest(tpath, (list.size() + 1), upload_id))){
|
||||
|
|
|
|||
48
src/curl.h
48
src/curl.h
|
|
@ -106,6 +106,22 @@ class S3fsCurl
|
|||
friend class S3fsMultiCurl;
|
||||
|
||||
private:
|
||||
enum REQTYPE {
|
||||
REQTYPE_UNSET = -1,
|
||||
REQTYPE_DELETE = 0,
|
||||
REQTYPE_HEAD,
|
||||
REQTYPE_PUTHEAD,
|
||||
REQTYPE_PUT,
|
||||
REQTYPE_GET,
|
||||
REQTYPE_CHKBUCKET,
|
||||
REQTYPE_LISTBUCKET,
|
||||
REQTYPE_PREMULTIPOST,
|
||||
REQTYPE_COMPLETEMULTIPOST,
|
||||
REQTYPE_UPLOADMULTIPOST,
|
||||
REQTYPE_COPYMULTIPOST,
|
||||
REQTYPE_MULTILIST
|
||||
};
|
||||
|
||||
// class variables
|
||||
static pthread_mutex_t curl_handles_lock;
|
||||
static pthread_mutex_t curl_share_lock;
|
||||
|
|
@ -132,19 +148,25 @@ class S3fsCurl
|
|||
|
||||
// variables
|
||||
CURL* hCurl;
|
||||
std::string path; // target object path
|
||||
std::string base_path; // base path (for multi curl head request)
|
||||
std::string saved_path; // saved path = cache key (for multi curl head request)
|
||||
std::string url; // target object path(url)
|
||||
REQTYPE type; // type of request
|
||||
std::string path; // target object path
|
||||
std::string base_path; // base path (for multi curl head request)
|
||||
std::string saved_path; // saved path = cache key (for multi curl head request)
|
||||
std::string url; // target object path(url)
|
||||
struct curl_slist* requestHeaders;
|
||||
headers_t responseHeaders; // header data by HeaderCallback
|
||||
BodyData* bodydata; // body data by WriteMemoryCallback
|
||||
BodyData* headdata; // header data by WriteMemoryCallback
|
||||
headers_t responseHeaders; // header data by HeaderCallback
|
||||
BodyData* bodydata; // body data by WriteMemoryCallback
|
||||
BodyData* headdata; // header data by WriteMemoryCallback
|
||||
long LastResponseCode;
|
||||
const unsigned char* postdata; // use by post method and read callback function.
|
||||
int postdata_remaining; // use by post method and read callback function.
|
||||
filepart partdata; // use by multipart upload/get object callback
|
||||
bool is_use_ahbe; // additional header by extension
|
||||
const unsigned char* postdata; // use by post method and read callback function.
|
||||
int postdata_remaining; // use by post method and read callback function.
|
||||
filepart partdata; // use by multipart upload/get object callback
|
||||
bool is_use_ahbe; // additional header by extension
|
||||
FILE* b_infile; // backup for retrying
|
||||
const unsigned char* b_postdata; // backup for retrying
|
||||
int b_postdata_remaining; // backup for retrying
|
||||
off_t b_partdata_startpos; // backup for retrying
|
||||
ssize_t b_partdata_size; // backup for retrying
|
||||
|
||||
public:
|
||||
// constructor/destructor
|
||||
|
|
@ -170,6 +192,8 @@ class S3fsCurl
|
|||
static S3fsCurl* ParallelGetObjectRetryCallback(S3fsCurl* s3fscurl);
|
||||
|
||||
// methods
|
||||
bool ResetHandle(void);
|
||||
bool RemakeHandle(void);
|
||||
bool ClearInternalData(void);
|
||||
std::string CalcSignature(std::string method, std::string strMD5, std::string content_type, std::string date, std::string resource);
|
||||
bool GetUploadId(std::string& upload_id);
|
||||
|
|
@ -217,7 +241,7 @@ class S3fsCurl
|
|||
bool DestroyCurlHandle(void);
|
||||
|
||||
bool GetResponseCode(long& responseCode);
|
||||
int RequestPerform(FILE* file = NULL);
|
||||
int RequestPerform(void);
|
||||
int DeleteRequest(const char* tpath);
|
||||
bool PreHeadRequest(const char* tpath, const char* bpath = NULL, const char* savedpath = NULL);
|
||||
bool PreHeadRequest(std::string& tpath, std::string& bpath, std::string& savedpath) {
|
||||
|
|
|
|||
Loading…
Reference in New Issue
Block a user