Merge pull request #427 from qiniu/fix/set-default-host

fix set_default rs, rsf and customize uc when query bucket region

Author: bachue

qiniu/config.py

@@ -21,6 +21,22 @@
     'default_upload_threshold': 2 * _BLOCK_SIZE  # put_file上传方式的临界默认值
 }
 
+_is_customized_default = {
+    'default_zone': False,
+    'default_rs_host': False,
+    'default_rsf_host': False,
+    'default_api_host': False,
+    'default_uc_host': False,
+    'connection_timeout': False,
+    'connection_retries': False,
+    'connection_pool': False,
+    'default_upload_threshold': False
+}
+
+
+def is_customized_default(key):
+    return _is_customized_default[key]
+
 
 def get_default(key):
     return _config[key]
@@ -32,19 +48,28 @@ def set_default(
         default_rsf_host=None, default_api_host=None, default_upload_threshold=None):
     if default_zone:
         _config['default_zone'] = default_zone
+        _is_customized_default['default_zone'] = True
     if default_rs_host:
         _config['default_rs_host'] = default_rs_host
+        _is_customized_default['default_rs_host'] = True
     if default_rsf_host:
         _config['default_rsf_host'] = default_rsf_host
+        _is_customized_default['default_rsf_host'] = True
     if default_api_host:
         _config['default_api_host'] = default_api_host
+        _is_customized_default['default_api_host'] = True
     if default_uc_host:
         _config['default_uc_host'] = default_uc_host
+        _is_customized_default['default_uc_host'] = True
     if connection_retries:
         _config['connection_retries'] = connection_retries
+        _is_customized_default['connection_retries'] = True
     if connection_pool:
         _config['connection_pool'] = connection_pool
+        _is_customized_default['connection_pool'] = True
     if connection_timeout:
         _config['connection_timeout'] = connection_timeout
+        _is_customized_default['connection_timeout'] = True
     if default_upload_threshold:
         _config['default_upload_threshold'] = default_upload_threshold
+        _is_customized_default['default_upload_threshold'] = True

qiniu/region.py

@@ -64,8 +64,11 @@ def get_io_host(self, ak, bucket, home_dir=None):
         return io_hosts[0]
 
     def get_rs_host(self, ak, bucket, home_dir=None):
+        from .config import get_default, is_customized_default
         if self.rs_host:
             return self.rs_host
+        if is_customized_default('default_rs_host'):
+            return get_default('default_rs_host')
         if home_dir is None:
             home_dir = os.getcwd()
         bucket_hosts = self.get_bucket_hosts(ak, bucket, home_dir)
@@ -75,8 +78,11 @@ def get_rs_host(self, ak, bucket, home_dir=None):
         return rs_hosts[0]
 
     def get_rsf_host(self, ak, bucket, home_dir=None):
+        from .config import get_default, is_customized_default
         if self.rsf_host:
             return self.rsf_host
+        if is_customized_default('default_rsf_host'):
+            return get_default('default_rsf_host')
         if home_dir is None:
             home_dir = os.getcwd()
         bucket_hosts = self.get_bucket_hosts(ak, bucket, home_dir)
@@ -201,7 +207,11 @@ def host_cache_to_file(self, home_dir):
         f.close()
 
     def bucket_hosts(self, ak, bucket):
-        url = "{0}/v1/query?ak={1}&bucket={2}".format(UC_HOST, ak, bucket)
+        from .config import get_default, is_customized_default
+        uc_host = UC_HOST
+        if is_customized_default('default_uc_host'):
+            uc_host = get_default('default_uc_host')
+        url = "{0}/v1/query?ak={1}&bucket={2}".format(uc_host, ak, bucket)
         ret = requests.get(url)
         data = compat.json.dumps(ret.json(), separators=(',', ':'))
         return data

test_qiniu.py

@@ -891,6 +891,24 @@ def test_get_domain(self):
         assert info.status_code == 200
 
 
+class RegionTestCase(unittest.TestCase):
+    test_rs_host = 'test.region.compatible.config.rs'
+    test_rsf_host = 'test.region.compatible.config.rsf'
+
+    def test_config_compatible(self):
+        try:
+            set_default(default_rs_host=self.test_rs_host)
+            set_default(default_rsf_host=self.test_rsf_host)
+            zone = Zone()
+            assert zone.get_rs_host("mock_ak", "mock_bucket") == self.test_rs_host
+            assert zone.get_rsf_host("mock_ak", "mock_bucket") == self.test_rsf_host
+        finally:
+            set_default(default_rs_host=qiniu.config.RS_HOST)
+            set_default(default_rsf_host=qiniu.config.RSF_HOST)
+            qiniu.config._is_customized_default['default_rs_host'] = False
+            qiniu.config._is_customized_default['default_rsf_host'] = False
+
+
 class ReadWithoutSeek(object):
     def __init__(self, str):
         self.str = str