fix(外观专利): 行重发加轮次上限,超限就地判失败并写明原因
两态行标让失败行下一轮能重新申领(否则发版/中断就永久丢行),代价是轮次层此前 完全没有闸:上游持续劣化时同一批行会一轮轮重发,每轮都过 SecretUsageContext.call 扣用户的 LLM 次数;而 assemble job 走 deferRunning 不累加 retry_count, MAX_RETRY_COUNT 那道闸永远到不了,HTTP 层的 llmRetryTimes=3 也只管单轮内部。 新增 aiimage.appearance-patent.llm-row-max-rounds(默认 3,<=0 关闭)。轮次落在独立 Redis 键上(处理中键会被撤销、完成键只在成功时打,只有这张表能回答"这行被重发过几次"), 首轮设 TTL 后续不自增 TTL;Redis 故障时读成 0,宁可不闸也不把在跑的检测判死。 顺带修 countUninspectedRows:Python 心跳超时恢复路径原先用 collectPendingLlmCandidates 数待检行数,那一步会把行申领走,紧接着真正发起检测时就一行也拿不到,整单只能等 处理中标记 TTL 过期。
This commit is contained in:
+55
-1
@@ -49,6 +49,7 @@ import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.anyLong;
|
||||
import static org.mockito.ArgumentMatchers.anyString;
|
||||
import static org.mockito.ArgumentMatchers.contains;
|
||||
import static org.mockito.ArgumentMatchers.eq;
|
||||
import static org.mockito.Mockito.inOrder;
|
||||
import static org.mockito.Mockito.lenient;
|
||||
@@ -61,7 +62,8 @@ import static org.mockito.Mockito.when;
|
||||
*
|
||||
* <p>合批之后一次请求带走 5–10 行,一次中断就是整批白做。原实现在收集候选时(发请求**之前**)
|
||||
* 就把行标成已处理,所以发版重启留下的不是"稍后补检",而是"永不再检"。
|
||||
* 这里钉住两条:申领发生在收集阶段、完成标记只允许出现在载荷 CAS 落库成功之后。
|
||||
* 这里钉住三条:申领发生在收集阶段、完成标记只允许出现在载荷 CAS 落库成功之后、
|
||||
* 重发轮次有上限(超限的行就地判失败并写明原因,不再白扣用户次数)。
|
||||
*/
|
||||
@ExtendWith(MockitoExtension.class)
|
||||
class AppearancePatentRowMarkTimingTest {
|
||||
@@ -225,6 +227,58 @@ class AppearancePatentRowMarkTimingTest {
|
||||
assertEquals(List.of("r1", "r2"), keys.getValue());
|
||||
}
|
||||
|
||||
/**
|
||||
* 重发轮次到顶的行必须就地判失败、写明原因,并且**不再发 LLM**。
|
||||
*
|
||||
* <p>两态标记让失败行下一轮重新成为候选,而 assemble job 的 deferRunning 不碰 retryCount,
|
||||
* 所以轮次层此前没有任何闸:上游劣化窗口内这批行会一轮轮重发,每轮都走
|
||||
* SecretUsageContext.call 扣用户的次数,且看不到"为什么还在跑"。
|
||||
*/
|
||||
@Test
|
||||
void rowsOverRoundCapAreTerminatedWithoutAnotherLlmCall() throws Exception {
|
||||
when(properties.getLlmRowMaxRounds()).thenReturn(2);
|
||||
when(taskCacheService.beginRowInspection(eq(TASK_ID), anyString())).thenReturn(true);
|
||||
when(taskCacheService.rowInspectionRounds(eq(TASK_ID), anyString())).thenReturn(2L);
|
||||
when(llmClient.markRowsFailed(any(), anyString())).thenReturn(rows(UNRESOLVED_ROWS));
|
||||
stubMergeWrite(1);
|
||||
|
||||
submit();
|
||||
|
||||
verify(llmClient, never()).inspectRows(any(), any(), any());
|
||||
verify(llmClient).markRowsFailed(any(), contains("轮次"));
|
||||
verify(taskCacheService).completeRowInspection(eq(TASK_ID), eq(List.of("r1", "r2")));
|
||||
verify(taskCacheService, never()).releaseRowInspection(anyLong(), any());
|
||||
}
|
||||
|
||||
/** 轮次没到顶的行照旧发出去,但必须先记一轮——不计数就等于上限永远到不了。 */
|
||||
@Test
|
||||
void sentBatchCountsOneRoundBeforeCallingLlm() throws Exception {
|
||||
when(properties.getLlmRowMaxRounds()).thenReturn(2);
|
||||
when(taskCacheService.beginRowInspection(eq(TASK_ID), anyString())).thenReturn(true);
|
||||
when(taskCacheService.rowInspectionRounds(eq(TASK_ID), anyString())).thenReturn(1L);
|
||||
when(llmClient.inspectRows(any(), any(), any())).thenReturn(rows(RESOLVED_ROWS));
|
||||
stubMergeWrite(1);
|
||||
|
||||
submit();
|
||||
|
||||
InOrder order = inOrder(taskCacheService, llmClient);
|
||||
order.verify(taskCacheService).countRowInspectionRound(TASK_ID, List.of("r1", "r2"));
|
||||
order.verify(llmClient).inspectRows(any(), any(), any());
|
||||
}
|
||||
|
||||
/**
|
||||
* 只是「数还有多少行待检」的入口不能顺手把行申领走:
|
||||
* stale 恢复路径是先数一遍再发起检测,数的时候申领掉的话紧接着那一步就一行也拿不到,
|
||||
* 整单只能等处理中标记 TTL 过期。
|
||||
*/
|
||||
@Test
|
||||
void countingPendingRowsDoesNotClaimThem() {
|
||||
Integer pending = ReflectionTestUtils.invokeMethod(service, "countUninspectedRows", List.of(chunk()));
|
||||
|
||||
assertEquals(2, pending == null ? 0 : pending);
|
||||
verify(taskCacheService, never()).beginRowInspection(anyLong(), anyString());
|
||||
}
|
||||
|
||||
// ===== 辅助 =====
|
||||
|
||||
private void submit() {
|
||||
|
||||
+42
@@ -152,4 +152,46 @@ class AppearancePatentTaskCacheServiceRowMarkTest {
|
||||
assertFalse(deleted.getValue().contains("processed-rows"), "撤销只能删处理中键,删完成标记会让已检测的行重跑并重复计费");
|
||||
verify(valueOperations, never()).set(anyString(), anyString(), any(Duration.class));
|
||||
}
|
||||
|
||||
/** 每发起一轮就自增一次:这是重发上限唯一的数据来源。 */
|
||||
@Test
|
||||
void roundCountIncrementsPerRound() {
|
||||
when(valueOperations.increment(anyString())).thenReturn(2L);
|
||||
|
||||
cache.countRowInspectionRound(TASK_ID, List.of(ROW_KEY));
|
||||
|
||||
ArgumentCaptor<String> key = ArgumentCaptor.forClass(String.class);
|
||||
verify(valueOperations).increment(key.capture());
|
||||
assertTrue(key.getValue().contains("row-rounds"), "轮次必须落在独立键上,不能和处理中/完成标记共用");
|
||||
}
|
||||
|
||||
/** 轮次键要跟着行的生命周期过期:INCR 出来的键默认永不过期,会一直堆在 Redis 里。 */
|
||||
@Test
|
||||
void firstRoundPutsTtlOnRoundKey() {
|
||||
when(valueOperations.increment(anyString())).thenReturn(1L);
|
||||
|
||||
cache.countRowInspectionRound(TASK_ID, List.of(ROW_KEY));
|
||||
|
||||
ArgumentCaptor<String> key = ArgumentCaptor.forClass(String.class);
|
||||
verify(redisTemplate).expire(key.capture(), any(Duration.class));
|
||||
assertTrue(key.getValue().contains("row-rounds"));
|
||||
}
|
||||
|
||||
/** 续轮不能再设 TTL:每轮一次 expire 是纯浪费,首轮设过就一直有效。 */
|
||||
@Test
|
||||
void laterRoundDoesNotRefreshTtl() {
|
||||
when(valueOperations.increment(anyString())).thenReturn(2L);
|
||||
|
||||
cache.countRowInspectionRound(TASK_ID, List.of(ROW_KEY));
|
||||
|
||||
verify(redisTemplate, never()).expire(anyString(), any(Duration.class));
|
||||
}
|
||||
|
||||
/** 只读轮次:Redis 降级时读成 0,宁可不闸也不能因为缓存故障把还在跑的检测判死。 */
|
||||
@Test
|
||||
void roundReadDegradesToZero() {
|
||||
when(valueOperations.get(anyString())).thenThrow(new IllegalStateException("redis down"));
|
||||
|
||||
assertEquals(0L, cache.rowInspectionRounds(TASK_ID, ROW_KEY));
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user