From d24ef6416059c885b2b82fac54475131505e4667 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=E9=BB=84=E8=87=AA=E8=BE=BE?= <980324341@qq.com> Date: Mon, 28 Sep 2026 01:26:59 +0800 Subject: [PATCH] =?UTF-8?q?fix(=E5=AD=98=E5=82=A8=E4=B8=8E=E5=B7=A1?= =?UTF-8?q?=E6=A3=80):=20MinIO=20=E5=BB=BA=E8=BF=9E=E8=B6=85=E6=97=B6?= =?UTF-8?q?=E6=94=B6=E5=88=B0=2010s=EF=BC=8C30=20=E7=A7=92=E5=B7=A1?= =?UTF-8?q?=E6=A3=80=E5=91=A8=E6=9C=9F=E6=94=B9=E5=9B=9E=202=20=E5=88=86?= =?UTF-8?q?=E9=92=9F?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit OssStorageService 的 MinioClient 走 8.5.17 默认值,connect/write/read 三项全是 5 分钟(S3Base.DEFAULT_CONNECTION_TIMEOUT):oss.aishufu.top 不可达时,跑在结果文件 作业线程上的每次上传/下载要挂满 5 分钟才失败。改为只收紧建连到 10s,读写留 120s 以覆盖数百 MB 结果文件的分片上传与流式读取。 delete-brand 与 collect-data 的 stale 巡检按 30 秒一轮跑,而判死阈值是 30 分钟心跳 超时——每分钟一轮纯属多余轮询(且两台各跑一份,另一端每轮打一条"另一个实例持有锁")。 delete-brand 代码里的 @Scheduled 默认值本来就是 2 分钟,是 yml 把它改成了 30 秒。 --- .../modules/collectdata/service/CollectDataService.java | 2 +- .../modules/file/service/oss/OssStorageService.java | 7 ++++++- backend-java/src/main/resources/application.yml | 4 ++-- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/CollectDataService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/CollectDataService.java index 96cfcfaf6..a33444361 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/CollectDataService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/collectdata/service/CollectDataService.java @@ -529,7 +529,7 @@ public class CollectDataService { && System.currentTimeMillis() - lastProgressFlushMillis >= progressDirtyWindowMillis; } - @Scheduled(cron = "${aiimage.collect-data.stale-check-cron:*/30 * * * * *}") + @Scheduled(cron = "${aiimage.collect-data.stale-check-cron:0 */2 * * * *}") public void finalizeStaleTasks() { // 双节点互斥:Redis 不可用时 fail-open(仅记日志),兜底靠下方 per-task DB 锁,不会双写终态 DistributedJobLockService.LockHandle jobLock = diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/file/service/oss/OssStorageService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/file/service/oss/OssStorageService.java index ff79c06df..8987f5746 100644 --- a/backend-java/src/main/java/com/nanri/aiimage/modules/file/service/oss/OssStorageService.java +++ b/backend-java/src/main/java/com/nanri/aiimage/modules/file/service/oss/OssStorageService.java @@ -720,10 +720,15 @@ public class OssStorageService { } private static MinioClient createClient(OssProperties properties) { - return MinioClient.builder() + MinioClient client = MinioClient.builder() .endpoint(withScheme(properties.getEndpoint())) .credentials(properties.getAccessKeyId(), properties.getAccessKeySecret()) .build(); + // MinIO 8.5.17 默认把 connect/write/read 三项全设成 5 分钟(S3Base.DEFAULT_CONNECTION_TIMEOUT)。 + // 端点不可达时,每次上传/下载要挂满 5 分钟才失败,而这些调用跑在结果文件作业线程上。 + // 只收紧建连;读写留足余量,要覆盖数百 MB 结果文件的分片上传与流式读取。 + client.setTimeout(10_000, 120_000, 120_000); + return client; } private String resolveBucket(String moduleType) { diff --git a/backend-java/src/main/resources/application.yml b/backend-java/src/main/resources/application.yml index a9c09dfa3..7b6161c18 100644 --- a/backend-java/src/main/resources/application.yml +++ b/backend-java/src/main/resources/application.yml @@ -198,7 +198,7 @@ aiimage: no-result-upload-timeout-minutes: ${AIIMAGE_BRAND_PROGRESS_NO_RESULT_UPLOAD_TIMEOUT_MINUTES:180} delete-brand-progress: heartbeat-timeout-minutes: ${AIIMAGE_DELETE_BRAND_HEARTBEAT_TIMEOUT_MINUTES:30} - stale-check-cron: ${AIIMAGE_DELETE_BRAND_STALE_CHECK_CRON:*/30 * * * * *} + stale-check-cron: ${AIIMAGE_DELETE_BRAND_STALE_CHECK_CRON:0 */2 * * * *} finalize-check-cron: ${AIIMAGE_DELETE_BRAND_FINALIZE_CHECK_CRON:30 */2 * * * *} product-risk-stale-timeout-minutes: ${AIIMAGE_PRODUCT_RISK_STALE_TIMEOUT_MINUTES:30} price-track-stale-timeout-minutes: ${AIIMAGE_PRICE_TRACK_STALE_TIMEOUT_MINUTES:30} @@ -377,7 +377,7 @@ aiimage: collect-data: stale-timeout-minutes: ${AIIMAGE_COLLECT_DATA_STALE_TIMEOUT_MINUTES:30} no-result-upload-timeout-minutes: ${AIIMAGE_COLLECT_DATA_NO_RESULT_UPLOAD_TIMEOUT_MINUTES:180} - stale-check-cron: ${AIIMAGE_COLLECT_DATA_STALE_CHECK_CRON:*/30 * * * * *} + stale-check-cron: ${AIIMAGE_COLLECT_DATA_STALE_CHECK_CRON:0 */2 * * * *} max-source-file-bytes: ${AIIMAGE_COLLECT_DATA_MAX_SOURCE_FILE_BYTES:0} max-parse-rows: ${AIIMAGE_COLLECT_DATA_MAX_PARSE_ROWS:0} max-chunk-rows: ${AIIMAGE_COLLECT_DATA_MAX_CHUNK_ROWS:0}