Fixed about ParallelMixMultipartUpload

s3fs-fuse · Jun 23, 2020 · 6c0b958 · 6c0b958
1 parent 9dc4148
commit 6c0b958
Show file tree

Hide file tree

Showing 5 changed files with 240 additions and 275 deletions.
diff --git a/src/curl.cpp b/src/curl.cpp
@@ -1610,7 +1610,7 @@ int S3fsCurl::ParallelMultipartUploadRequest(const char* tpath, headers_t& meta,
   return 0;
 }
 
-int S3fsCurl::ParallelMixMultipartUploadRequest(const char* tpath, headers_t& meta, int fd, const PageList& pagelist)
+int S3fsCurl::ParallelMixMultipartUploadRequest(const char* tpath, headers_t& meta, int fd, const fdpage_list_t& mixuppages)
 {
   int            result;
   string         upload_id;
@@ -1621,30 +1621,21 @@ int S3fsCurl::ParallelMixMultipartUploadRequest(const char* tpath, headers_t& me
 
   S3FS_PRN_INFO3("[tpath=%s][fd=%d]", SAFESTRPTR(tpath), fd);
 
-  // get upload mixed page list
-  fdpage_list_t fdplist;
-  if(!pagelist.GetMultipartSizeList(fdplist, S3fsCurl::multipart_size)){
-    return -1;
-  }
-
   // duplicate fd
   if(-1 == (fd2 = dup(fd)) || 0 != lseek(fd2, 0, SEEK_SET)){
     S3FS_PRN_ERR("Could not duplicate file descriptor(errno=%d)", errno);
-    PageList::FreeList(fdplist);
     if(-1 != fd2){
       close(fd2);
     }
     return -errno;
   }
   if(-1 == fstat(fd2, &st)){
     S3FS_PRN_ERR("Invalid file descriptor(errno=%d)", errno);
-    PageList::FreeList(fdplist);
     close(fd2);
     return -errno;
   }
 
   if(0 != (result = s3fscurl.PreMultipartPostRequest(tpath, meta, upload_id, true))){
-    PageList::FreeList(fdplist);
     close(fd2);
     return result;
   }
@@ -1662,7 +1653,7 @@ int S3fsCurl::ParallelMixMultipartUploadRequest(const char* tpath, headers_t& me
   curlmulti.SetSuccessCallback(S3fsCurl::MixMultipartPostCallback);
   curlmulti.SetRetryCallback(S3fsCurl::MixMultipartPostRetryCallback);
 
-  for(fdpage_list_t::const_iterator iter = fdplist.begin(); iter != fdplist.end(); ++iter){
+  for(fdpage_list_t::const_iterator iter = mixuppages.begin(); iter != mixuppages.end(); ++iter){
     // s3fscurl sub object
     S3fsCurl* s3fscurl_para              = new S3fsCurl(true);
 
@@ -1680,7 +1671,6 @@ int S3fsCurl::ParallelMixMultipartUploadRequest(const char* tpath, headers_t& me
       // initiate upload part for parallel
       if(0 != (result = s3fscurl_para->UploadMultipartPostSetup(tpath, list.size(), upload_id))){
         S3FS_PRN_ERR("failed uploading part setup(%d)", result);
-        PageList::FreeList(fdplist);
         close(fd2);
         delete s3fscurl_para;
         return result;
@@ -1711,13 +1701,11 @@ int S3fsCurl::ParallelMixMultipartUploadRequest(const char* tpath, headers_t& me
     // set into parallel object
     if(!curlmulti.SetS3fsCurlObject(s3fscurl_para)){
       S3FS_PRN_ERR("Could not make curl object into multi curl(%s).", tpath);
-      PageList::FreeList(fdplist);
       close(fd2);
       delete s3fscurl_para;
       return -1;
     }
   }
-  PageList::FreeList(fdplist);
 
   // Multi request
   if(0 != (result = curlmulti.Request())){

diff --git a/src/curl.h b/src/curl.h
@@ -186,7 +186,8 @@ class CurlHandlerPool
 //----------------------------------------------
 // class S3fsCurl
 //----------------------------------------------
-class PageList;
+#include "fdcache.h"    // for fdpage_list_t
+
 class S3fsCurl;
 
 // Prototype function for lazy setup options for curl handle
@@ -415,7 +416,7 @@ class S3fsCurl
     static bool InitMimeType(const std::string& strFile);
     static bool DestroyS3fsCurl(void);
     static int ParallelMultipartUploadRequest(const char* tpath, headers_t& meta, int fd);
-    static int ParallelMixMultipartUploadRequest(const char* tpath, headers_t& meta, int fd, const PageList& pagelist);
+    static int ParallelMixMultipartUploadRequest(const char* tpath, headers_t& meta, int fd, const fdpage_list_t& mixuppages);
     static int ParallelGetObjectRequest(const char* tpath, int fd, off_t start, ssize_t size);
     static bool CheckIAMCredentialUpdate(void);