Fixed refactoring mistakes about loading IAM credentials

ggtakec · Jan 18, 2025 · 0be0e5c · 0be0e5c
1 parent be183c0
commit 0be0e5c
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 3 deletions.
diff --git a/src/s3fs_cred.cpp b/src/s3fs_cred.cpp
@@ -452,6 +452,11 @@ bool S3fsCred::LoadIAMCredentials()
         S3FS_PRN_ERR("Something error occurred, could not set IAM credentials.");
         return false;
     }
+
+    if(!SetIAMCredentials(cred.c_str())){
+        S3FS_PRN_ERR("Something error occurred, could not set IAM role name.");
+        return false;
+    }
     return true;
 }
 
@@ -497,8 +502,6 @@ bool S3fsCred::LoadIAMRoleFromMetaData()
 
 bool S3fsCred::SetIAMCredentials(const char* response)
 {
-    const std::lock_guard<std::mutex> lock(token_lock);
-
     S3FS_PRN_INFO3("IAM credential response = \"%s\"", response);
 
     iamcredmap_t keyval;

diff --git a/src/s3fs_cred.h b/src/s3fs_cred.h
@@ -152,7 +152,7 @@ class S3fsCred
 
         bool GetIAMCredentialsURL(std::string& url, bool check_iam_role) REQUIRES(S3fsCred::token_lock);
         bool LoadIAMCredentials() REQUIRES(S3fsCred::token_lock);
-        bool SetIAMCredentials(const char* response);
+        bool SetIAMCredentials(const char* response) REQUIRES(S3fsCred::token_lock);
         bool SetIAMRoleFromMetaData(const char* response);
 
         bool SetExtCredLib(const char* arg);