diff --git a/backend-java/src/main/java/com/nanri/aiimage/config/HttpClientPool.java b/backend-java/src/main/java/com/nanri/aiimage/config/HttpClientPool.java
index 7bcddb415..f23fd70ca 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/config/HttpClientPool.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/config/HttpClientPool.java
@@ -5,6 +5,7 @@ import lombok.extern.slf4j.Slf4j;
import org.springframework.http.client.ClientHttpRequestFactory;
import org.springframework.http.client.JdkClientHttpRequestFactory;
+import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.net.Authenticator;
@@ -15,7 +16,14 @@ import java.net.URI;
import java.net.http.HttpClient;
import java.net.http.HttpRequest;
import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
import java.time.Duration;
+import java.util.concurrent.ExecutionException;
+import java.util.concurrent.ExecutorService;
+import java.util.concurrent.Executors;
+import java.util.concurrent.Future;
+import java.util.concurrent.TimeUnit;
+import java.util.concurrent.TimeoutException;
/**
* Task 77:外部 HTTP 客户端统一连接复用池。
@@ -29,6 +37,9 @@ public class HttpClientPool {
private static volatile HttpClient sharedHttpClient;
private static volatile long configuredCallTimeoutMillis;
+ /** 响应体读取的掐断执行器:一次性虚拟线程,只在读取期间存在,不占业务线程池。 */
+ private static final ExecutorService BODY_READ_EXECUTOR =
+ Executors.newThreadPerTaskExecutor(Thread.ofVirtual().name("http-body-read-", 0).factory());
/** 由 Spring 配置属性在启动阶段调用,确保共享客户端使用实际的 connect/call 配置。 */
public static void configure(long connectTimeoutMillis, long callTimeoutMillis) {
@@ -92,6 +103,73 @@ public class HttpClientPool {
return response.body();
}
+ /**
+ * 在预算内读完响应体(UTF-8),超过 maxBytes 直接判体积越界。
+ *
+ *
为什么不能就地 while-read:{@code java.net.http} 的请求超时只封顶到「响应头」,
+ * 响应体是流式的,{@code HttpResponseInputStream.read()} 内部是
+ * {@code ArrayBlockingQueue.take()} —— 上游只发了半截就发呆时,这一读就是**永久 park**,
+ * 配多长的 readTimeout 都管不到它。现网实证:12 条 {@code similar-asin-llm-row} 虚拟线程
+ * 全卡在这一读上,连带把上层 {@code task-queue} 线程和它手里的 {@code task:*} 分布式锁
+ * 一起焊死(看门狗还在无条件续期),该任务此后每次结果回传都判 40902。
+ *
+ *
所以把读取挪进一次性虚拟线程,由调用方拿预算去等:到点就中断读取并关流,
+ * 把「上游发呆」从永久挂死降级成一次可重试的 IOException。
+ */
+ public static String readBodyBounded(InputStream input, Duration budget, int maxBytes) throws IOException {
+ if (input == null) {
+ return "";
+ }
+ long safeBudgetMillis = Math.max(1_000L, budget == null ? 0L : budget.toMillis());
+ Future future = BODY_READ_EXECUTOR.submit(() -> drainUtf8(input, maxBytes));
+ try {
+ return future.get(safeBudgetMillis, TimeUnit.MILLISECONDS);
+ } catch (TimeoutException ex) {
+ future.cancel(true);
+ closeQuietly(input);
+ throw new IOException("响应体读取超过 " + safeBudgetMillis + "ms 预算,已掐断(上游未发完)");
+ } catch (InterruptedException ex) {
+ future.cancel(true);
+ closeQuietly(input);
+ Thread.currentThread().interrupt();
+ throw new IOException("响应体读取被中断", ex);
+ } catch (ExecutionException ex) {
+ closeQuietly(input);
+ Throwable cause = ex.getCause();
+ if (cause instanceof IOException ioException) {
+ throw ioException;
+ }
+ throw new IOException("响应体读取失败: " + (cause == null ? ex.getMessage() : cause.getMessage()), cause);
+ }
+ }
+
+ private static String drainUtf8(InputStream input, int maxBytes) throws IOException {
+ try (InputStream body = input; ByteArrayOutputStream output = new ByteArrayOutputStream(8192)) {
+ byte[] buffer = new byte[8192];
+ int read;
+ int total = 0;
+ while ((read = body.read(buffer)) != -1) {
+ if (read == 0) {
+ continue;
+ }
+ if ((long) total + read > maxBytes) {
+ throw new IOException("响应体超过 " + maxBytes + " 字节上限");
+ }
+ output.write(buffer, 0, read);
+ total += read;
+ }
+ return output.toString(StandardCharsets.UTF_8);
+ }
+ }
+
+ private static void closeQuietly(InputStream input) {
+ try {
+ input.close();
+ } catch (Exception ignored) {
+ // 掐断路径上关不掉不额外报:连接由 JDK 的取消动作负责回收
+ }
+ }
+
/** 按 readTimeout(毫秒)创建共享连接池工厂;非法值钳制到最小正数。 */
public static ClientHttpRequestFactory requestFactory(int readTimeoutMillis) {
return requestFactory(readTimeoutMillis, null);
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/client/AppearancePatentLlmClient.java b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/client/AppearancePatentLlmClient.java
index 4d6188809..16d580eb5 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/client/AppearancePatentLlmClient.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/appearancepatent/client/AppearancePatentLlmClient.java
@@ -19,10 +19,10 @@ import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestClient;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
+import java.time.Duration;
import java.util.ArrayList;
import java.util.Arrays;
import java.util.LinkedHashMap;
@@ -673,7 +673,7 @@ public class AppearancePatentLlmClient {
});
request.body(body);
String responseText = request.exchange((clientRequest, clientResponse) -> {
- String responseBody = readResponseBodyBounded(clientResponse.getBody());
+ String responseBody = readResponseBodyBounded(clientResponse.getBody(), attempt);
if (!clientResponse.getStatusCode().is2xxSuccessful()) {
throw new IllegalStateException("LLM http " + clientResponse.getStatusCode().value()
+ ": " + abbreviate(responseBody, 500));
@@ -842,26 +842,12 @@ public class AppearancePatentLlmClient {
}
}
- private String readResponseBodyBounded(InputStream inputStream) throws IOException {
- if (inputStream == null) {
- return "";
- }
- try (InputStream input = inputStream; ByteArrayOutputStream output = new ByteArrayOutputStream(8192)) {
- byte[] buffer = new byte[8192];
- int read;
- int total = 0;
- while ((read = input.read(buffer)) != -1) {
- if (read == 0) {
- continue;
- }
- if ((long) total + read > MAX_LLM_RESPONSE_BYTES) {
- throw new IOException("LLM response exceeds " + MAX_LLM_RESPONSE_BYTES + " bytes");
- }
- output.write(buffer, 0, read);
- total += read;
- }
- return output.toString(StandardCharsets.UTF_8);
- }
+ /** 响应体读取预算与本次实际用的那套超时对齐;JDK 的超时只到响应头,这一腿原先无界。 */
+ private String readResponseBodyBounded(InputStream inputStream, int attempt) throws IOException {
+ long budget = attempt == 1
+ ? Math.min(firstAttemptTimeoutMillis(), Math.max(1, properties.getLlmReadTimeoutMillis()))
+ : Math.max(1, properties.getLlmReadTimeoutMillis());
+ return HttpClientPool.readBodyBounded(inputStream, Duration.ofMillis(budget), MAX_LLM_RESPONSE_BYTES);
}
private JsonNode parseJsonOrThrow(String value) {
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/client/SimilarAsinLlmClient.java b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/client/SimilarAsinLlmClient.java
index cfbf50a54..2514300c5 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/client/SimilarAsinLlmClient.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/similarasin/client/SimilarAsinLlmClient.java
@@ -15,10 +15,10 @@ import org.springframework.http.MediaType;
import org.springframework.stereotype.Component;
import org.springframework.web.client.RestClient;
-import java.io.ByteArrayOutputStream;
import java.io.IOException;
import java.io.InputStream;
import java.nio.charset.StandardCharsets;
+import java.time.Duration;
import java.util.ArrayList;
import java.util.LinkedHashMap;
import java.util.List;
@@ -126,7 +126,7 @@ public class SimilarAsinLlmClient {
});
request.body(body);
String responseText = request.exchange((clientRequest, clientResponse) -> {
- String responseBody = readResponseBodyBounded(clientResponse.getBody());
+ String responseBody = readResponseBodyBounded(clientResponse.getBody(), attempt);
if (!clientResponse.getStatusCode().is2xxSuccessful()) {
throw new IllegalStateException("LLM http " + clientResponse.getStatusCode().value()
+ ": " + abbreviate(responseBody, 500));
@@ -273,26 +273,15 @@ public class SimilarAsinLlmClient {
}
}
- private String readResponseBodyBounded(InputStream inputStream) throws IOException {
- if (inputStream == null) {
- return "";
- }
- try (InputStream input = inputStream; ByteArrayOutputStream output = new ByteArrayOutputStream(8192)) {
- byte[] buffer = new byte[8192];
- int read;
- int total = 0;
- while ((read = input.read(buffer)) != -1) {
- if (read == 0) {
- continue;
- }
- if ((long) total + read > MAX_LLM_RESPONSE_BYTES) {
- throw new IOException("LLM response exceeds " + MAX_LLM_RESPONSE_BYTES + " bytes");
- }
- output.write(buffer, 0, read);
- total += read;
- }
- return output.toString(StandardCharsets.UTF_8);
- }
+ /**
+ * 响应体的读取预算:与本次实际用的那个 RestClient 的超时对齐(首试用短超时那套),
+ * 但**必须自己另算**——JDK 的超时只到响应头,响应体这一腿原先没有任何界。
+ */
+ private String readResponseBodyBounded(InputStream inputStream, int attempt) throws IOException {
+ long budget = attempt == 1
+ ? Math.min(firstAttemptTimeoutMillis(), Math.max(1, properties.getLlmReadTimeoutMillis()))
+ : Math.max(1, properties.getLlmReadTimeoutMillis());
+ return HttpClientPool.readBodyBounded(inputStream, Duration.ofMillis(budget), MAX_LLM_RESPONSE_BYTES);
}
private JsonNode parseJsonOrThrow(String value) {
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/ActiveTaskLockRegistry.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/ActiveTaskLockRegistry.java
index 992a62d0a..f3018be3f 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/ActiveTaskLockRegistry.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/ActiveTaskLockRegistry.java
@@ -70,6 +70,15 @@ final class ActiveTaskLockRegistry {
active.remove(lockName);
}
+ /**
+ * 只有登记的就是这一任时才摘除。封顶放弃过的那把锁,持有线程可能过了很久才走到 close,
+ * 这期间新持有者已经登记同名锁——按名字无条件删就会把新那一任的读数抹掉(看门狗就此失明)。
+ */
+ void unregisterIfCurrent(String lockName, long acquiredAtMillis) {
+ active.computeIfPresent(lockName,
+ (key, lock) -> lock.acquiredAtMillis == acquiredAtMillis ? null : lock);
+ }
+
void markRenewalLost(String lockName) {
ActiveLock lock = active.get(lockName);
if (lock != null) {
diff --git a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskDistributedLockService.java b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskDistributedLockService.java
index bfe498b88..cdece47e1 100644
--- a/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskDistributedLockService.java
+++ b/backend-java/src/main/java/com/nanri/aiimage/modules/task/service/TaskDistributedLockService.java
@@ -11,10 +11,13 @@ import java.time.Duration;
import java.util.LinkedHashMap;
import java.util.Locale;
import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
import java.util.concurrent.Executors;
import java.util.concurrent.ScheduledExecutorService;
import java.util.concurrent.ScheduledFuture;
import java.util.concurrent.TimeUnit;
+import java.util.concurrent.atomic.AtomicBoolean;
+import java.util.concurrent.atomic.AtomicInteger;
@Service
@RequiredArgsConstructor
@@ -30,9 +33,24 @@ public class TaskDistributedLockService {
/** 持锁时长留痕:任务锁被 LLM 批处理占用是 40902 的来源,此前只有 WAIT_LLM 一支量得出时长。 */
private static final long HELD_REPORT_MILLIS = 5000L;
private static final long HELD_WARN_MILLIS = 60000L;
+ /**
+ * 持锁封顶=max(30 分钟, 6×TTL)。越过这条线还续着期,说明持有方已经卡死而不是在干活:
+ * 现网实测三把 {@code task:similar-asin:*} 被看门狗喂到 11.3 小时不放,期间该任务的
+ * 每一次结果回传都判 40902(两小时窗口 2370 次),任务永远停在 RUNNING。
+ * 到线后停止续期、让 Redis 键在 TTL 内自然过期,把"永久焊死"降级成"最多卡 TTL 量级"。
+ */
+ private static final long MAX_HOLD_FLOOR_MILLIS = 30 * 60_000L;
+ private static final int MAX_HOLD_TTL_MULTIPLE = 6;
private final DistributedJobLockService distributedJobLockService;
- private final ThreadLocal