fix(oss): 建 client 时带上 region,预签名不再联网探 GetBucketLocation

minio-java 未设 region 时,getPresignedObjectUrl/putObject 都会先向端点发一发
GetBucketLocation。预签名本身不需要网络,却被这一步吊在端点可达性上——
2026-10-21 主机A 隔离期间,出链因此吃满 10 秒建连超时、整条上传链路报 500。
region 留空时保持旧行为(不替配置猜值),并配一条"摘掉 region 必须失败"的反向对照。
This commit is contained in:
2026-10-21 23:23:09 +08:00
parent 66b71a544c
commit bae954d8d0
2 changed files with 41 additions and 3 deletions
@@ -801,10 +801,17 @@ public class OssStorageService {
}
private static MinioClient createClient(OssProperties properties, String endpoint) {
MinioClient client = MinioClient.builder()
MinioClient.Builder builder = MinioClient.builder()
.endpoint(withScheme(endpoint))
.credentials(properties.getAccessKeyId(), properties.getAccessKeySecret())
.build();
.credentials(properties.getAccessKeyId(), properties.getAccessKeySecret());
// 显式带上 region:未设时 minio-java 每次 presign/putObject 都要先联网发一发
// GetBucketLocation 探 region,预签名本身并不需要有网络,这一步却让它吊在端点可达性上
// ——2026-10-21 主机A 隔离期间就是这条把出链打成 10 秒建连超时。
String region = properties.getRegion();
if (region != null && !region.isBlank()) {
builder.region(region.trim());
}
MinioClient client = builder.build();
// MinIO 8.5.17 默认把 connect/write/read 三项全设成 5 分钟(S3Base.DEFAULT_CONNECTION_TIMEOUT)。
// 端点不可达时,每次上传/下载要挂满 5 分钟才失败,而这些调用跑在结果文件作业线程上。
// 只收紧建连;读写留足余量,要覆盖数百 MB 结果文件的分片上传与流式读取。
@@ -153,6 +153,37 @@ class OssStorageServiceTest {
() -> storageService.presignSoftwareVersionUpload("other/prefix.zip", 180));
}
// ==================== region 是否进了 client:预签名不许吊在端点可达性上 ====================
private OssProperties unreachableProperties(String region) {
OssProperties p = new OssProperties();
p.setEndpoint("http://127.0.0.1:1");
p.setPublicEndpoint("http://127.0.0.1:1");
p.setBucket("nanri-ai-images");
p.setSoftwareVersionBucket("nanri-image");
p.setAccessKeyId("test-access-key");
p.setAccessKeySecret("test-secret-key");
p.setRegion(region);
return p;
}
@Test
void presignSucceedsAgainstUnreachableEndpointWhenRegionConfigured() {
// 端点指向不可达地址:region 已配 ⇒ 预签名应当纯本地算出,不再发 GetBucketLocation
OssStorageService oss = new OssStorageService(unreachableProperties("us-east-1"));
String url = oss.presignSoftwareVersionUpload("nanri-image/versions/3.0.67.zip", 180);
assertTrue(url.contains("X-Amz-Signature="), "应拿到带签名的直链,实际:" + url);
}
@Test
void presignStillFailsAgainstUnreachableEndpointWithoutRegion() {
// 反向对照:region 留空时保持 minio-java 旧行为(联网探 region),端点不可达就得失败——
// 这条存在的意义是证明上一条不是因为"根本没走网络逻辑"而假绿
OssStorageService oss = new OssStorageService(unreachableProperties(""));
assertThrows(RuntimeException.class,
() -> oss.presignSoftwareVersionUpload("nanri-image/versions/3.0.67.zip", 180));
}
@Test
void clientBucketSoftwareVersionUrlResolution() {
assertEquals("https://oss.aishufu.top/client/nanri-image/versions/3.0.66.zip",