add user_agent_suffix option and support specify tmpdir

Author: yongqingliu

configure.ac

@@ -21,7 +21,7 @@
 dnl Process this file with autoconf to produce a configure script.
 
 AC_PREREQ(2.59)
-AC_INIT(cosfs, 1.0.20)
+AC_INIT(cosfs, 1.0.21)
 AC_CONFIG_HEADER([config.h])
 
 AC_CANONICAL_SYSTEM

src/curl.cpp

@@ -309,7 +309,7 @@ mimes_t          S3fsCurl::mimeTypes;
 int              S3fsCurl::max_parallel_cnt    = 10;              // default
 off_t            S3fsCurl::multipart_size      = MULTIPART_SIZE; // default
 bool             S3fsCurl::is_sigv4            = true;           // default
-const string     S3fsCurl::skUserAgent = "tencentyun-cosfs-v5-" + string(VERSION);
+string     S3fsCurl::skUserAgent = "tencentyun-cosfs-v5-" + string(VERSION);
 
 //-------------------------------------------------------------------
 // Class methods for S3fsCurl
@@ -1413,6 +1413,12 @@ bool S3fsCurl::SetRAMCredentials(const char* response)
   return true;
 }
 
+bool S3fsCurl::SetUserAgentSuffix(const std::string& suffix) {
+  skUserAgent = "tencentyun-cosfs-v5-";
+  skUserAgent +=  suffix + "-" + VERSION;
+  return true;
+}
+
 bool S3fsCurl::CheckRAMCredentialUpdate(void)
 {
   if(0 == S3fsCurl::CAM_role.size()){

src/curl.h

@@ -237,7 +237,7 @@ class S3fsCurl
     static int              max_parallel_cnt;
     static off_t            multipart_size;
     static bool             is_sigv4;
-    static const std::string skUserAgent;
+    static std::string skUserAgent;
 
     // variables
     CURL*                hCurl;
@@ -320,6 +320,7 @@ class S3fsCurl
     static int ParallelMultipartUploadRequest(const char* tpath, headers_t& meta, int fd);
     static int ParallelGetObjectRequest(const char* tpath, int fd, off_t start, ssize_t size);
     static bool CheckRAMCredentialUpdate(void);
+    static bool SetUserAgentSuffix(const std::string& suffix);
 
     // class methods(valiables)
     static std::string LookupMimeType(std::string name);

src/fdcache.cpp

@@ -780,7 +780,7 @@ int FdEntity::Open(headers_t* pmeta, ssize_t size, time_t time)
     // not using cache
 
     // open temporary file
-    if(NULL == (pfile = tmpfile()) || -1 ==(fd = fileno(pfile))){
+    if(NULL == (pfile = FdManager::MakeTempFile()) || -1 ==(fd = fileno(pfile))){
       S3FS_PRN_ERR("failed to open tmp file. err(%d)", errno);
       if(pfile){
         fclose(pfile);
@@ -1713,6 +1713,7 @@ pthread_mutex_t FdManager::fd_manager_lock;
 bool            FdManager::is_lock_init(false);
 string          FdManager::cache_dir("");
 size_t          FdManager::free_disk_space = 0;
+std::string     FdManager::tmp_dir = "";
 
 //------------------------------------------------
 // FdManager class methods
@@ -1859,6 +1860,28 @@ fsblkcnt_t FdManager::GetFreeDiskSpace(const char* path)
   return (vfsbuf.f_bavail * vfsbuf.f_bsize);
 }
 
+FILE* FdManager::MakeTempFile() {
+    if (tmp_dir.empty()) {
+      return tmpfile();
+    }
+    int fd;
+    char cfn[PATH_MAX];
+    std::string fn = tmp_dir + "/cosfstmp.XXXXXX";
+    strncpy(cfn, fn.c_str(), sizeof(cfn) - 1);
+    cfn[sizeof(cfn) - 1] = '\0';
+
+    fd = mkstemp(cfn);
+    if (-1 == fd) {
+        S3FS_PRN_ERR("failed to create tmp file. errno(%d)", errno);
+        return NULL;
+    }
+    if (-1 == unlink(cfn)) {
+        S3FS_PRN_ERR("failed to delete tmp file. errno(%d)", errno);
+        return NULL;
+    }
+    return fdopen(fd, "rb+");
+}
+
 bool FdManager::IsSafeDiskSpace(const char* path, size_t size)
 {
   fsblkcnt_t fsize = FdManager::GetFreeDiskSpace(path);
@@ -2061,6 +2084,16 @@ bool FdManager::Close(FdEntity* ent)
   return false;
 }
 
+bool FdManager::SetTmpDir(const char *dir)
+{
+    if(!dir || '\0' == dir[0]){
+        tmp_dir = "/tmp";
+    }else{
+        tmp_dir = dir;
+    }
+    return true;
+}
+
 bool FdManager::ChangeEntityToTempPath(FdEntity* ent, const char* path)
 {
   AutoLock auto_lock(&FdManager::fd_manager_lock);

src/fdcache.h

@@ -196,6 +196,7 @@ class FdManager
     static size_t          free_disk_space; // limit free disk space
 
     fdent_map_t            fent;
+    static std::string     tmp_dir;
 
   private:
     static fsblkcnt_t GetFreeDiskSpace(const char* path);
@@ -227,6 +228,8 @@ class FdManager
     void Rename(const std::string &from, const std::string &to);
     bool Close(FdEntity* ent);
     bool ChangeEntityToTempPath(FdEntity* ent, const char* path);
+    static bool SetTmpDir(const char* dir);
+    static FILE* MakeTempFile();
 };
 
 #endif // FD_CACHE_H_

src/s3fs.cpp

@@ -4583,6 +4583,15 @@ static int my_fuse_opt_proc(void* data, const char* arg, int key, struct fuse_ar
       noxattr = true;
       return 0;
     }
+    if(0 == STR2NCMP(arg, "user_agent_suffix=")){
+      std::string user_agent_suffix = string(strchr(arg, '=') + sizeof(char));
+      S3fsCurl::SetUserAgentSuffix(user_agent_suffix);
+      return 0;
+    }
+    if(0 == STR2NCMP(arg, "tmpdir=")){
+      FdManager::SetTmpDir(strchr(arg, '=') + sizeof(char));
+      return 0;
+    }
     // old format for storage_class
     if(0 == strcmp(arg, "use_rrs") || 0 == STR2NCMP(arg, "use_rrs=")){
       off_t rrs = 1;
@@ -4911,6 +4920,7 @@ static int my_fuse_opt_proc(void* data, const char* arg, int key, struct fuse_ar
       is_specified_endpoint = true;
       return 0;
     }
+
     if(0 == strcmp(arg, "use_path_request_style")){
       pathrequeststyle = true;
       return 0;

src/s3fs_util.cpp

@@ -929,6 +929,12 @@ void show_help (void)
     "   del_cache (delete local file cache)\n"
     "      - delete local file cache when cosfs starts and exits.\n"
     "\n"
+    "   tmpdir (default=\"/tmp\")\n"
+    "      - local folder for temporary files.\n"
+    "\n"
+    "   user_agent_suffix (http request user agent suffix)\n"
+    "      - specify http request user agent.\n"
+    "\n"
     "   storage_class (default=\"standard\")\n"
     "      - store object with specified storage class.  Possible values:\n"
     "        standard, standard_ia, and reduced_redundancy.\n"