octoleo/s3fs-fuse
1
0
Fork 0
mirror of https://github.com/s3fs-fuse/s3fs-fuse.git synced 2025-01-03 13:07:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #923 from ggtakec/master

Browse Source 
Reverted automatic region change and changed messages
This commit is contained in:
Takeshi Nakatani 2019-01-23 23:00:31 +09:00 committed by GitHub
commit fa287aeef7
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 32 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

22
src/s3fs.cpp
View File

@ -134,6 +134,7 @@ static bool is_ibm_iam_auth = false;
static bool is_use_xattr = false; static bool is_use_xattr = false;
static bool create_bucket = false; static bool create_bucket = false;
static int64_t singlepart_copy_limit = FIVE_GB; static int64_t singlepart_copy_limit = FIVE_GB;
static bool is_specified_endpoint = false;
static int s3fs_init_deferred_exit_status = 0; static int s3fs_init_deferred_exit_status = 0;
static bool support_compat_dir = true;// default supports compatibility directory type static bool support_compat_dir = true;// default supports compatibility directory type
static int max_keys_list_object = 1000;// default is 1000 static int max_keys_list_object = 1000;// default is 1000
@ -3755,12 +3756,25 @@ static int s3fs_check_service(void)
// check wrong endpoint, and automatically switch endpoint // check wrong endpoint, and automatically switch endpoint
if(300 <= responseCode && responseCode < 500){ if(300 <= responseCode && responseCode < 500){
// check region error
// check region error(for putting message or retrying)
BodyData* body = s3fscurl.GetBodyData(); BodyData* body = s3fscurl.GetBodyData();
string expectregion; string expectregion;
if(check_region_error(body->str(), endpoint, expectregion)){ if(check_region_error(body->str(), endpoint, expectregion)){
// [NOTE]
// If endpoint is not specified(using us-east-1 region) and
// an error is encountered accessing a different region, we
// will retry the check on the expected region.
// see) https://docs.aws.amazon.com/AmazonS3/latest/dev/UsingBucket.html#access-bucket-intro
//
if(is_specified_endpoint){
const char* tmp_expect_ep = expectregion.c_str();
S3FS_PRN_CRIT("The bucket region is not '%s', it is correctly '%s'. You should specify 'endpoint=%s' option.",
endpoint.c_str(), tmp_expect_ep, tmp_expect_ep);
}else{
// current endpoint is wrong, so try to connect to expected region. // current endpoint is wrong, so try to connect to expected region.
S3FS_PRN_CRIT("Could not connect wrong region %s, so retry to connect region %s.", endpoint.c_str(), expectregion.c_str()); S3FS_PRN_CRIT("Failed to connect region '%s'(default), so retry to connect region '%s'.", endpoint.c_str(), expectregion.c_str());
endpoint = expectregion; endpoint = expectregion;
if(S3fsCurl::IsSignatureV4()){ if(S3fsCurl::IsSignatureV4()){
if(host == "http://s3.amazonaws.com"){ if(host == "http://s3.amazonaws.com"){
@ -3776,11 +3790,12 @@ static int s3fs_check_service(void)
responseCode = s3fscurl.GetLastResponseCode(); responseCode = s3fscurl.GetLastResponseCode();
} }
} }
}
// try signature v2 // try signature v2
if(0 > res && (responseCode == 400 || responseCode == 403) && S3fsCurl::IsSignatureV4()){ if(0 > res && (responseCode == 400 || responseCode == 403) && S3fsCurl::IsSignatureV4()){
// switch sigv2 // switch sigv2
S3FS_PRN_WARN("Could not connect, so retry to connect by signature version 2."); S3FS_PRN_CRIT("Failed to connect by sigv4, so retry to connect by signature version 2.");
S3fsCurl::SetSignatureV4(false); S3fsCurl::SetSignatureV4(false);
// retry to check with sigv2 // retry to check with sigv2
@ -4838,6 +4853,7 @@ static int my_fuse_opt_proc(void* data, const char* arg, int key, struct fuse_ar
} }
if(0 == STR2NCMP(arg, "endpoint=")){ if(0 == STR2NCMP(arg, "endpoint=")){
endpoint = strchr(arg, '=') + sizeof(char); endpoint = strchr(arg, '=') + sizeof(char);
is_specified_endpoint = true;
return 0; return 0;
} }
if(0 == strcmp(arg, "use_path_request_style")){ if(0 == strcmp(arg, "use_path_request_style")){