reorder query region hosts

qiniu · Jul 21, 2023 · 6d90d65 · 6d90d65
1 parent 904c28c
commit 6d90d65
Show file tree

Hide file tree

Showing 3 changed files with 31 additions and 19 deletions.
diff --git a/qiniu/config.py b/qiniu/config.py
@@ -5,6 +5,7 @@
 RSF_HOST = 'http://rsf.qbox.me'  # 列举操作Host
 API_HOST = 'http://api.qiniuapi.com'  # 数据处理操作Host
 UC_HOST = region.UC_HOST  # 获取空间信息Host
+QUERY_REGION_HOST = 'https://kodo-config.qiniuapi.com'
 
 _BLOCK_SIZE = 1024 * 1024 * 4  # 断点续传分块大小，该参数为接口规格，暂不支持修改
 
@@ -14,11 +15,12 @@
     'default_rsf_host': RSF_HOST,
     'default_api_host': API_HOST,
     'default_uc_host': UC_HOST,
-    'default_uc_backup_hosts': [
-        'kodo-config.qiniuapi.com',
+    'default_query_region_host': QUERY_REGION_HOST,
+    'default_query_region_backup_hosts': [
+        'uc.qbox.me',
         'api.qiniu.com'
     ],
-    'default_uc_backup_retry_times': 2,
+    'default_backup_hosts_retry_times': 2,
     'connection_timeout': 30,  # 链接超时为时间为30s
     'connection_retries': 3,  # 链接重试次数为3次
     'connection_pool': 10,  # 链接池个数为10
@@ -31,8 +33,9 @@
     'default_rsf_host': False,
     'default_api_host': False,
     'default_uc_host': False,
-    'default_uc_backup_hosts': False,
-    'default_uc_backup_retry_times': False,
+    'default_query_region_host': False,
+    'default_query_region_backup_hosts': False,
+    'default_backup_hosts_retry_times': False,
     'connection_timeout': False,
     'connection_retries': False,
     'connection_pool': False,
@@ -52,7 +55,8 @@ def set_default(
         default_zone=None, connection_retries=None, connection_pool=None,
         connection_timeout=None, default_rs_host=None, default_uc_host=None,
         default_rsf_host=None, default_api_host=None, default_upload_threshold=None,
-        default_uc_backup_hosts=None, default_uc_backup_retry_times=None):
+        default_query_region_host=None, default_query_region_backup_hosts=None,
+        default_backup_hosts_retry_times=None):
     if default_zone:
         _config['default_zone'] = default_zone
         _is_customized_default['default_zone'] = True
@@ -68,14 +72,21 @@ def set_default(
     if default_uc_host:
         _config['default_uc_host'] = default_uc_host
         _is_customized_default['default_uc_host'] = True
-        _config['default_uc_backup_hosts'] = []
-        _is_customized_default['default_uc_backup_hosts'] = True
-    if default_uc_backup_hosts:
-        _config['default_uc_backup_hosts'] = default_uc_backup_hosts
-        _is_customized_default['default_uc_backup_hosts'] = True
-    if default_uc_backup_retry_times:
-        _config['default_uc_backup_retry_times'] = default_uc_backup_retry_times
-        _is_customized_default['default_uc_backup_retry_times'] = True
+        _config['default_query_region_host'] = default_uc_host
+        _is_customized_default['default_query_region_host'] = True
+        _config['default_query_region_backup_hosts'] = []
+        _is_customized_default['default_query_region_backup_hosts'] = True
+    if default_query_region_host:
+        _config['default_query_region_host'] = default_query_region_host
+        _is_customized_default['default_query_region_host'] = True
+        _config['default_query_region_backup_hosts'] = []
+        _is_customized_default['default_query_region_backup_hosts'] = True
+    if default_query_region_backup_hosts:
+        _config['default_query_region_backup_hosts'] = default_query_region_backup_hosts
+        _is_customized_default['default_query_region_backup_hosts'] = True
+    if default_backup_hosts_retry_times:
+        _config['default_backup_hosts_retry_times'] = default_backup_hosts_retry_times
+        _is_customized_default['default_backup_hosts_retry_times'] = True
     if connection_retries:
         _config['connection_retries'] = connection_retries
         _is_customized_default['connection_retries'] = True

diff --git a/qiniu/region.py b/qiniu/region.py
@@ -227,8 +227,8 @@ def bucket_hosts(self, ak, bucket):
         uc_host = UC_HOST
         if is_customized_default('default_uc_host'):
             uc_host = get_default('default_uc_host')
-        uc_backup_hosts = get_default('default_uc_backup_hosts')
-        uc_backup_retry_times = get_default('default_uc_backup_retry_times')
+        uc_backup_hosts = get_default('default_query_region_backup_hosts')
+        uc_backup_retry_times = get_default('default_backup_hosts_retry_times')
         url = "{0}/v4/query?ak={1}&bucket={2}".format(uc_host, ak, bucket)
 
         ret, _resp = qn_http_client.get(

diff --git a/test_qiniu.py b/test_qiniu.py
@@ -1017,7 +1017,7 @@ def test_query_region_with_backup_domains(self):
         try:
             set_default(
                 default_uc_host='https://fake-uc.phpsdk.qiniu.com',
-                default_uc_backup_hosts=[
+                default_query_region_backup_hosts=[
                     'unavailable-uc.phpsdk.qiniu.com',
                     'uc.qbox.me'
                 ]
@@ -1028,8 +1028,9 @@ def test_query_region_with_backup_domains(self):
         finally:
             set_default(
                 default_uc_host=qiniu.config.UC_HOST,
-                default_uc_backup_hosts=[
-                    'kodo-config.qiniuapi.com',
+                default_query_region_host=qiniu.config.QUERY_REGION_HOST,
+                default_query_region_backup_hosts=[
+                    'uc.qbox.me',
                     'api.qiniu.com'
                 ]
             )