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

rewind upon retry

Browse Source 
git-svn-id: http://s3fs.googlecode.com/svn/trunk@106 df820570-a93a-0410-bd06-b72b767a4274
This commit is contained in:
rrizun 2008-02-25 04:16:15 +00:00
parent 104d7dd29d
commit c5d9fdb607
1 changed files with 6 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
s3fs/s3fs.cpp
View File

@ -236,10 +236,12 @@ static int retries = 2;
* @return fuse return code * @return fuse return code
*/ */
static int static int
my_curl_easy_perform(CURL* curl) { my_curl_easy_perform(CURL* curl, FILE* f = 0) {
// 1 attempt + retries... // 1 attempt + retries...
int t = 1+retries; int t = 1+retries;
while (t-- > 0) { while (t-- > 0) {
if (f)
rewind(f);
CURLcode curlCode = curl_easy_perform(curl); CURLcode curlCode = curl_easy_perform(curl);
if (curlCode == 0) if (curlCode == 0)
return 0; return 0;
@ -577,7 +579,7 @@ get_local_fd(const char* path) {
cout << "downloading[path=" << path << "][fd=" << fd << "]" << endl; cout << "downloading[path=" << path << "][fd=" << fd << "]" << endl;
VERIFY(my_curl_easy_perform(curl.get())); VERIFY(my_curl_easy_perform(curl.get(), f));
//only one of these is needed... //only one of these is needed...
fflush(f); fflush(f);
@ -642,11 +644,11 @@ put_local_fd(const char* path, headers_t meta, int fd) {
headers.append("Authorization: AWS "+AWSAccessKeyId+":"+calc_signature("PUT", ContentType, date, headers.get(), resource)); headers.append("Authorization: AWS "+AWSAccessKeyId+":"+calc_signature("PUT", ContentType, date, headers.get(), resource));
curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers.get()); curl_easy_setopt(curl, CURLOPT_HTTPHEADER, headers.get());
rewind(f); //###rewind(f);
cout << "uploading[path=" << path << "][fd=" << fd << "][size="<<st.st_size <<"]" << endl; cout << "uploading[path=" << path << "][fd=" << fd << "][size="<<st.st_size <<"]" << endl;
VERIFY(my_curl_easy_perform(curl.get())); VERIFY(my_curl_easy_perform(curl.get(), f));
return 0; return 0;
} }