add backup host

Author: longbai

qiniu/io.py

@@ -53,6 +53,7 @@ def put(uptoken, key, data, extra=None):
         {'filename': fname, 'data': data, 'mime_type': extra.mime_type},
     ]
     ret, err, code = rpc.Client(conf.UP_HOST).call_with_multipart("/", fields, files)
+    print err
     if err is None or code == 571 or code == 614:
         return ret, err
 

qiniu/resumable_io.py

@@ -66,20 +66,25 @@ def put_file(uptoken, key, localfile, extra):
     """ 上传文件 """
     f = open(localfile, "rb")
     statinfo = os.stat(localfile)
-    ret = put(uptoken, key, f, statinfo.st_size, extra)
+    ret, err = put(uptoken, key, f, statinfo.st_size, extra)
     f.close()
-    return ret
+    return ret, err
 
-
-def put(uptoken, key, f, fsize, extra, host=None):
+def put(uptoken, key, f, fsize, extra):
     """ 上传二进制流, 通过将data "切片" 分段上传 """
     if not isinstance(extra, PutExtra):
         print("extra must the instance of PutExtra")
         return
+    host = conf.UP_HOST
+    ret, err, code = put_with_host(uptoken, key, f, fsize, extra, host)
+    if err is None or code == 571 or code == 614:
+        return ret, err
+
+    ret, err, code = put_with_host(uptoken, key, f, fsize, extra, conf.UP_HOST2)
+    return ret, err
 
-    if host is None:
-        host = conf.UP_HOST
 
+def put_with_host(uptoken, key, f, fsize, extra, host):
     block_cnt = block_count(fsize)
     if extra.progresses is None:
         extra.progresses = [None] * block_cnt
@@ -113,15 +118,14 @@ def put(uptoken, key, f, fsize, extra, host=None):
     mkfile_client = auth_up.Client(uptoken, mkfile_host)
     return mkfile(mkfile_client, key, fsize, extra, mkfile_host)
 
-
 def resumable_block_put(block, index, extra, uptoken, host):
     block_size = len(block)
 
     mkblk_client = auth_up.Client(uptoken, host)
     if extra.progresses[index] is None or "ctx" not in extra.progresses[index]:
         crc32 = gen_crc32(block)
         block = bytearray(block)
-        extra.progresses[index], err = mkblock(mkblk_client, block_size, block, host)
+        extra.progresses[index], err, code = mkblock(mkblk_client, block_size, block, host)
         if err is not None:
             extra.notify_err(index, block_size, err)
             return err

qiniu/test/io_test.py

@@ -114,7 +114,7 @@ def test_put_StringIO():
 
         def test_put_urlopen():
             key = "test_%s" % r(9)
-            data = urllib.urlopen('http://cheneya.qiniudn.com/hello_jpg')
+            data = urllib.urlopen('http://pythonsdk.qiniudn.com/hello.jpg')
             ret, err = io.put(policy.token(), key, data)
             assert err is None
             assert ret['key'] == key
@@ -155,6 +155,7 @@ def read(self, n=None):
         test_put_urlopen()
         test_put_no_length()
 
+
     def test_put_file(self):
         localfile = "%s" % __file__
         key = "test_%s" % r(9)
@@ -178,6 +179,18 @@ def test_put_fail_reqid(self):
         ret, err = io.put("", key, data, extra)
         assert "reqid" in err
 
+    def test_put_with_uphost2(self):
+        #mistake up host
+        conf.UP_HOST = "api.qiniu.com"
+        localfile = "%s" % __file__
+        key = "test_up2_%s" % r(9)
+
+        extra.check_crc = 1
+        ret, err = io.put_file(policy.token(), key, localfile, extra)
+        assert err is None
+        assert ret['key'] == key
+        conf.UP_HOST = "up.qiniu.com"
+
 
 class Test_get_file_crc32(unittest.TestCase):
 

qiniu/test/resumable_io_test.py

@@ -37,14 +37,15 @@ class TestBlock(unittest.TestCase):
     def test_block(self):
         if is_travis:
             return
+        host = conf.UP_HOST
         policy = rs.PutPolicy(bucket)
         uptoken = policy.token()
         client = up.Client(uptoken)
 
         # rets = [0, 0]
         data_slice_2 = "\nbye!"
-        ret, err = resumable_io.mkblock(
-            client, len(data_slice_2), data_slice_2)
+        ret, err, code = resumable_io.mkblock(
+            client, len(data_slice_2), data_slice_2, host)
         assert err is None, err
         self.assertEqual(ret["crc32"], binascii.crc32(data_slice_2))
 
@@ -56,16 +57,16 @@ def test_block(self):
             lens += extra.progresses[i]["offset"]
 
         key = u"sdk_py_resumable_block_4_%s" % r(9)
-        ret, err = resumable_io.mkfile(client, key, lens, extra)
-        assert err is None, err
+        ret, err, code = resumable_io.mkfile(client, key, lens, extra, host)
+        assert err is None
         self.assertEqual(
             ret["hash"], "FtCFo0mQugW98uaPYgr54Vb1QsO0", "hash not match")
         rs.Client().delete(bucket, key)
 
     def test_put(self):
         if is_travis:
             return
-        src = urllib.urlopen("http://cheneya.qiniudn.com/hello_jpg")
+        src = urllib.urlopen("http://pythonsdk.qiniudn.com/hello.jpg")
         ostype = platform.system()
         if ostype.lower().find("windows") != -1:
             tmpf = "".join([os.getcwd(), mktemp()])
@@ -84,8 +85,7 @@ def test_put(self):
         ret, err = resumable_io.put_file(policy.token(), key, localfile, extra)
         dst.close()
         os.remove(tmpf)
-
-        assert err is None, err
+        assert err is None
         assert ret.get("x:foo") == "test", "return data not contains 'x:foo'"
         self.assertEqual(
             ret["hash"], "FnyTMUqPNRTdk1Wou7oLqDHkBm_p", "hash not match")
@@ -112,7 +112,7 @@ def test_put_4m(self):
         ret, err = resumable_io.put_file(policy.token(), key, localfile, extra)
         dst.close()
         os.remove(tmpf)
-
+        print err
         assert err is None, err
         assert ret.get("x:foo") == "test", "return data not contains 'x:foo'"
         self.assertEqual(