Skip to content

Commit 6cb74c4

Browse files
author
yangsen
committed
fix: resume v2 block size & upload use acc host first
1 parent 857416d commit 6cb74c4

File tree

2 files changed

+7
-7
lines changed

2 files changed

+7
-7
lines changed

src/main/java/com/qiniu/storage/AutoRegion.java

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -335,13 +335,13 @@ private List<String> allHosts() {
335335

336336
private List<String> allSrcHosts() {
337337
List<String> hosts = new ArrayList<>();
338-
if (acc != null) {
339-
List<String> mainHosts = acc.get("main");
338+
if (src != null) {
339+
List<String> mainHosts = src.get("main");
340340
if (mainHosts != null && mainHosts.size() > 0) {
341341
hosts.addAll(mainHosts);
342342
}
343343

344-
List<String> backupHosts = acc.get("backup");
344+
List<String> backupHosts = src.get("backup");
345345
if (backupHosts != null && backupHosts.size() > 0) {
346346
hosts.addAll(backupHosts);
347347
}
@@ -351,13 +351,13 @@ private List<String> allSrcHosts() {
351351

352352
private List<String> allAccHosts() {
353353
List<String> hosts = new ArrayList<>();
354-
if (src != null) {
355-
List<String> mainHosts = src.get("main");
354+
if (acc != null) {
355+
List<String> mainHosts = acc.get("main");
356356
if (mainHosts != null && mainHosts.size() > 0) {
357357
hosts.addAll(mainHosts);
358358
}
359359

360-
List<String> backupHosts = src.get("backup");
360+
List<String> backupHosts = acc.get("backup");
361361
if (backupHosts != null && backupHosts.size() > 0) {
362362
hosts.addAll(backupHosts);
363363
}

src/main/java/com/qiniu/storage/ResumeUploadSource.java

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -28,9 +28,9 @@ abstract class ResumeUploadSource {
2828

2929
ResumeUploadSource(Configuration config, String recordKey) {
3030
this.config = config;
31+
this.resumableUploadAPIVersion = config.resumableUploadAPIVersion;
3132
this.blockSize = getBlockSize(config);
3233
this.recordKey = recordKey;
33-
this.resumableUploadAPIVersion = config.resumableUploadAPIVersion;
3434
}
3535

3636
// 所有块数据是否 正在上传 或者 已上传,为 true 则说明没有需要上传的数据块

0 commit comments

Comments
 (0)