feat: add uc backup hosts

Author: lihsai0

qiniu/config.py

@@ -2,12 +2,13 @@
 RS_HOST = 'http://rs.qiniu.com'  # 管理操作Host
 RSF_HOST = 'http://rsf.qbox.me'  # 列举操作Host
 API_HOST = 'http://api.qiniuapi.com'  # 数据处理操作Host
-UC_HOST = 'https://uc.qbox.me'  # 获取空间信息Host
 QUERY_REGION_HOST = 'https://uc.qiniuapi.com'
 QUERY_REGION_BACKUP_HOSTS = [
     'kodo-config.qiniuapi.com',
     'uc.qbox.me'
 ]
+UC_HOST = QUERY_REGION_HOST  # 获取空间信息Host
+UC_BACKUP_HOSTS = QUERY_REGION_BACKUP_HOSTS
 
 _BLOCK_SIZE = 1024 * 1024 * 4  # 断点续传分块大小，该参数为接口规格，暂不支持修改
 
@@ -17,6 +18,7 @@
     'default_rsf_host': RSF_HOST,
     'default_api_host': API_HOST,
     'default_uc_host': UC_HOST,
+    'default_uc_backup_hosts': UC_BACKUP_HOSTS,
     'default_query_region_host': QUERY_REGION_HOST,
     'default_query_region_backup_hosts': QUERY_REGION_BACKUP_HOSTS,
     'default_backup_hosts_retry_times': 3,  # 仅控制旧区域 LegacyRegion 查询 Hosts 的重试次数
@@ -27,18 +29,8 @@
 }
 
 _is_customized_default = {
-    'default_zone': False,
-    'default_rs_host': False,
-    'default_rsf_host': False,
-    'default_api_host': False,
-    'default_uc_host': 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,
-    'default_upload_threshold': False
+    k: False
+    for k in _config.keys()
 }
 
 
@@ -59,7 +51,7 @@ def set_default(
         connection_timeout=None, default_rs_host=None, default_uc_host=None,
         default_rsf_host=None, default_api_host=None, default_upload_threshold=None,
         default_query_region_host=None, default_query_region_backup_hosts=None,
-        default_backup_hosts_retry_times=None):
+        default_backup_hosts_retry_times=None, default_uc_backup_hosts=None):
     if default_zone:
         _config['default_zone'] = default_zone
         _is_customized_default['default_zone'] = True
@@ -75,16 +67,23 @@ 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
         _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_uc_backup_hosts is not None:
+        _config['default_uc_backup_hosts'] = default_uc_backup_hosts
+        _is_customized_default['default_uc_backup_hosts'] = True
+        _config['default_query_region_backup_hosts'] = default_uc_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:
+    if default_query_region_backup_hosts is not None:
         _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:

qiniu/services/storage/bucket.py

@@ -626,9 +626,10 @@ def __uc_do_with_retrier(self, url_resource, data=None):
         # handle compatibility for default_uc
         if not regions:
             uc_host = config.get_default('default_uc_host')
+            uc_backup_hosts = config.get_default('default_uc_backup_hosts')
             uc_endpoints = [
                 Endpoint.from_host(h)
-                for h in [uc_host]
+                for h in [uc_host] + uc_backup_hosts
             ]
             regions = [Region(services={ServiceName.UC: uc_endpoints})]
 

tests/cases/conftest.py

@@ -64,6 +64,7 @@ def set_conf_default(request):
         'default_rsf_host': qn_config.RSF_HOST,
         'default_api_host': qn_config.API_HOST,
         'default_uc_host': qn_config.UC_HOST,
+        'default_uc_backup_hosts': qn_config.UC_BACKUP_HOSTS,
         'default_query_region_host': qn_config.QUERY_REGION_HOST,
         'default_query_region_backup_hosts': [
             'uc.qbox.me',

tests/cases/test_zone/test_qiniu_conf.py

@@ -1,6 +1,7 @@
 import pytest
 
 from qiniu import Zone
+from qiniu.config import get_default
 
 TEST_RS_HOST = 'rs.test.region.compatible.config.qiniu.com'
 TEST_RSF_HOST = 'rsf.test.region.compatible.config.qiniu.com'
@@ -9,9 +10,26 @@
 
 class TestQiniuConfWithZone:
     """
-    Test qiniu.conf with Zone(aka legacy Region)
+    Test qiniu.conf with Zone(aka LegacyRegion)
     """
 
+    @pytest.mark.parametrize(
+        'set_conf_default',
+        [
+            {
+                'default_uc_backup_hosts': [],
+            },
+            {
+                'default_uc_backup_hosts': [],
+                'default_query_region_backup_hosts': []
+            }
+        ],
+        indirect=True
+    )
+    def test_disable_backup_hosts(self, set_conf_default):
+        assert get_default('default_uc_backup_hosts') == []
+        assert get_default('default_query_region_backup_hosts') == []
+
     @pytest.mark.parametrize(
         'set_conf_default',
         [