断点续传多host

Author: longbai

src/com/qiniu/resumableio/ResumableClient.java

@@ -130,7 +130,7 @@ public ICancel bput(String host, InputStreamAt input, String ctx, long blockOffs
 		return client;
 	}
 
-	public ICancel mkfile(String key, long fsize, String mimeType, Map<String, String> params, String ctxs, CallRet ret) {
+	public ICancel mkfile(final String key, final long fsize, final String mimeType, final Map<String, String> params, final String ctxs, final CallRet ret) {
 		String url = Conf.UP_HOST + mkfilePath(key, fsize, mimeType, params);
 		StringEntity entity = null;
 		try {
@@ -140,7 +140,24 @@ public ICancel mkfile(String key, long fsize, String mimeType, Map<String, Strin
 			ret.onFailure(new QiniuException(QiniuException.InvalidEncode, "mkfile", e));
 			return null;
 		}
-		return call(makeClientExecutor(), url, entity, ret);
+
+		CallRet retryRet = new RetryRet(ret){
+			@Override
+			public void onFailure(QiniuException ex) {
+				if (RetryRet.noRetry(ex)){
+					ret.onFailure(ex);
+					return;
+				}
+				String url2 = Conf.UP_HOST2 + mkfilePath(key, fsize, mimeType, params);
+				StringEntity entity2 = null;
+				try {
+					entity2 = new StringEntity(ctxs);
+				} catch (UnsupportedEncodingException e) {
+				}
+				call(makeClientExecutor(), url2, entity2, ret);
+			}
+		};
+		return call(makeClientExecutor(), url, entity, retryRet);
 	}
 
 	private static String mkfilePath(String key, long fsize, String mimeType, Map<String, String> params){

tests/src/com/qiniu/test/UploadTest.java

@@ -93,7 +93,7 @@ public void tearDown() throws Exception {
 	}
 
 	@SmallTest
-	public void testS() throws IOException, JSONException, InterruptedException {
+	public void testIOkilo() throws IOException, JSONException, InterruptedException {
 		file = createFile(0.2, ".test");
 		uri = Uri.fromFile(file);
 		IO.putFile(context, uptoken, key, uri, extra, jsonRet);
@@ -114,7 +114,7 @@ public void testIOMultiHost() throws IOException, JSONException, InterruptedExce
 	}
 
 	 @MediumTest
-	 public void testM() throws IOException, JSONException, InterruptedException {
+	 public void testIOMega() throws IOException, JSONException, InterruptedException {
 	 	file = createFile(0.1, "--—— 中   文   .test");
 	 	uri = Uri.fromFile(file);
 	 	IO.putFile(context, uptoken, key, uri, extra, jsonRet);
@@ -123,7 +123,7 @@ public void testM() throws IOException, JSONException, InterruptedException {
 	 }
 
 	@SmallTest
-	public void testRS() throws IOException, JSONException, InterruptedException {
+	public void testRIOkilo() throws IOException, JSONException, InterruptedException {
 		file = createFile(0.2, ".test");
 		uri = Uri.fromFile(file);
 		ResumableIO.putFile(context, uptoken, key, uri, rextra, jsonRet);
@@ -132,14 +132,26 @@ public void testRS() throws IOException, JSONException, InterruptedException {
 	}
 
 	@MediumTest
-	public void testRM() throws IOException, JSONException, InterruptedException {
+	public void testRIOMega() throws IOException, JSONException, InterruptedException {
 		file = createFile(4, ".test");
 		uri = Uri.fromFile(file);
 		ResumableIO.putFile(context, uptoken, key, uri, rextra, jsonRet);
 		sem.acquire();
 		successCheck();
 	}
 
+	@MediumTest
+	public void testRIOMutiHost() throws IOException, JSONException, InterruptedException {
+		String old = Conf.UP_HOST;
+		Conf.UP_HOST = "http://127.0.0.1:1";
+		file = createFile(4, ".test");
+		uri = Uri.fromFile(file);
+		ResumableIO.putFile(context, uptoken, key, uri, rextra, jsonRet);
+		sem.acquire();
+		Conf.UP_HOST = old;
+		successCheck();
+	}
+
 	// @MediumTest
 	// public void testRL() throws IOException, JSONException, InterruptedException {
 	// 	file = createFile(8.6, ".test");