fix(可观测): 让"续跑/兜底拉取没开"在日志里可辨识,并纠正与 yml 相反的默认值
V129 客户端中断自动续跑从上线至今一次都没执行过:aiimage.task-resume.enabled 继承 aiimage.client-task-pull.enabled,两台生产两个键都没设 → false → resumeInterruptedTasks() 第一行 return。7 天 12 个「客户端异常中断」任务、 48 轮巡检 resume(s=0 r=0 k=0 u=0)、pull-pending 1 小时 4443 次空返回, 在日志上与"恰好没有中断任务"完全同形。 不改开关(属产品语义:兜底拉取会把用户只解析没点启动的 PENDING 真跑, 而外观专利占 LLM 花费 95% 且扣用户自付次数),已写进决策文档 §十三 交人工决定。 本版只做三件事: - ResumeStats.ran:真查过库才算跑过;巡检段位改 resume(ran= s= r= k= u=) - TaskResumeService / TaskClientPullService 各加 @PostConstruct 生效配置启动行 - @Value 的 enabled 默认由 :true 改为继承 client-task-pull.enabled:false(与 yml 同语义) 测试:TaskResumeServiceTest +4、TaskClientPullServiceTest +1,全量 3271 通过 / 0 失败。
This commit is contained in:
+35
@@ -1,5 +1,8 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import ch.qos.logback.classic.Logger;
|
||||
import ch.qos.logback.classic.spi.ILoggingEvent;
|
||||
import ch.qos.logback.core.read.ListAppender;
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper;
|
||||
@@ -13,6 +16,7 @@ import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
@@ -156,6 +160,37 @@ class TaskClientPullServiceTest {
|
||||
new StubHandler("SIMILAR_ASIN", payload("similar-asin-run"))));
|
||||
}
|
||||
|
||||
/**
|
||||
* 启动必须把兜底拉取的生效配置打出来。
|
||||
*
|
||||
* <p>它与续跑是一对({@code task-resume.enabled} 默认继承本开关),线上两个键都没配 → 都是关;
|
||||
* 而关闭时 {@code pullPendingTasks} 直接返回空,接口 200 且响应与"开了但没候选"一模一样
|
||||
* (实测 1 小时 4443 次 pull-pending 全空返回)。没有这一行日志就永远查不出来。
|
||||
*/
|
||||
@Test
|
||||
void 启动时打印生效配置() {
|
||||
Logger logger = (Logger) LoggerFactory.getLogger(TaskClientPullService.class);
|
||||
ListAppender<ILoggingEvent> appender = new ListAppender<>();
|
||||
appender.start();
|
||||
logger.addAppender(appender);
|
||||
try {
|
||||
TaskClientPullService service = service(new StubHandler("SIMILAR_ASIN", payload("similar-asin-run")));
|
||||
ReflectionTestUtils.setField(service, "enabled", false);
|
||||
|
||||
service.logEffectiveConfig();
|
||||
|
||||
String line = appender.list.stream()
|
||||
.map(ILoggingEvent::getFormattedMessage)
|
||||
.filter(m -> m.contains("[client-task-pull] 生效配置"))
|
||||
.findFirst()
|
||||
.orElse("");
|
||||
assertTrue(line.contains("enabled=false"), "启动必须说得清兜底拉取开没开:<" + line + ">");
|
||||
assertTrue(line.contains("moduleTypes=SIMILAR_ASIN,COLLECT_DATA"), line);
|
||||
} finally {
|
||||
logger.detachAppender(appender);
|
||||
}
|
||||
}
|
||||
|
||||
private TaskClientPullService service(ClientTaskPullSpi... handlers) {
|
||||
TaskClientPullService service = new TaskClientPullService(
|
||||
fileTaskMapper, new InstanceMetadata("server-test"), List.of(handlers));
|
||||
|
||||
+81
@@ -1,10 +1,14 @@
|
||||
package com.nanri.aiimage.modules.task.service;
|
||||
|
||||
import ch.qos.logback.classic.Logger;
|
||||
import ch.qos.logback.classic.spi.ILoggingEvent;
|
||||
import ch.qos.logback.core.read.ListAppender;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import com.nanri.aiimage.modules.task.spi.ClientTaskPullSpi;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.slf4j.LoggerFactory;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
|
||||
import java.time.LocalDateTime;
|
||||
@@ -12,6 +16,7 @@ import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertFalse;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.Mockito.doThrow;
|
||||
@@ -165,4 +170,80 @@ class TaskResumeServiceTest {
|
||||
assertEquals(1, stats.skippedTaskCount);
|
||||
verify(mapper, never()).insert(any(FileTaskEntity.class));
|
||||
}
|
||||
|
||||
/**
|
||||
* 开关关着时,统计必须说"本轮没跑",不能长得像"跑了但没活"。
|
||||
*
|
||||
* <p>线上 2026-09-28 实测:{@code resume(s=0 r=0 k=0 u=0)} 在两台连续 48 轮全零,
|
||||
* 而 {@code aiimage.task-resume.enabled} 的真实默认是
|
||||
* {@code ${AIIMAGE_TASK_RESUME_ENABLED:${AIIMAGE_CLIENT_TASK_PULL_ENABLED:false}}}(生产两个键都没设)
|
||||
* —— 也就是说 V129 整套续跑从来没执行过,但从巡检日志上和"恰好没有中断任务"完全无法区分。
|
||||
*/
|
||||
@Test
|
||||
void 开关关闭时统计标记本轮未执行() {
|
||||
FileTaskMapper mapper = mock(FileTaskMapper.class);
|
||||
TaskResumeService service = service(mapper, List.of(spi("SIMILAR_ASIN")), false, 3);
|
||||
|
||||
TaskResumeService.ResumeStats stats = service.resumeInterruptedTasks();
|
||||
|
||||
assertFalse(stats.ran, "关闭时必须留得下「没跑」这个信息,否则日志里与「跑了没候选」同形");
|
||||
assertEquals(0, stats.scannedTaskCount);
|
||||
}
|
||||
|
||||
/** 真的查过库才算"本轮执行过",包括零候选的轮次。 */
|
||||
@Test
|
||||
void 查过库之后标记本轮已执行即使没有候选() {
|
||||
FileTaskMapper mapper = mock(FileTaskMapper.class);
|
||||
when(mapper.selectList(any())).thenReturn(List.of());
|
||||
when(mapper.selectCount(any())).thenReturn(0L);
|
||||
TaskResumeService service = service(mapper, List.of(spi("SIMILAR_ASIN")), true, 3);
|
||||
|
||||
TaskResumeService.ResumeStats stats = service.resumeInterruptedTasks();
|
||||
|
||||
assertTrue(stats.ran);
|
||||
assertEquals(0, stats.scannedTaskCount);
|
||||
}
|
||||
|
||||
/** 没有注册兜底实现等于跑不了:同样要标记未执行,不能报成"跑了没活"。 */
|
||||
@Test
|
||||
void 无模块注册时也算本轮未执行() {
|
||||
FileTaskMapper mapper = mock(FileTaskMapper.class);
|
||||
TaskResumeService service = service(mapper, List.of(), true, 3);
|
||||
|
||||
TaskResumeService.ResumeStats stats = service.resumeInterruptedTasks();
|
||||
|
||||
assertFalse(stats.ran);
|
||||
}
|
||||
|
||||
/**
|
||||
* 开机必须把续跑的生效配置打出来。
|
||||
*
|
||||
* <p>续跑是"功能写完了、测试全绿、线上默认关"的典型:光看代码里的
|
||||
* {@code @Value(":true")} 会以为默认开着,实际 yml 把默认压成了 false。
|
||||
* 所以启动那一行要直接说清 enabled 是什么、上限多少,别再让人去反推。
|
||||
*/
|
||||
@Test
|
||||
void 启动时打印生效配置() {
|
||||
Logger logger = (Logger) LoggerFactory.getLogger(TaskResumeService.class);
|
||||
ListAppender<ILoggingEvent> appender = new ListAppender<>();
|
||||
appender.start();
|
||||
logger.addAppender(appender);
|
||||
try {
|
||||
FileTaskMapper mapper = mock(FileTaskMapper.class);
|
||||
TaskResumeService service = service(mapper, List.of(spi("SIMILAR_ASIN")), false, 3);
|
||||
service.logEffectiveConfig();
|
||||
|
||||
String line = appender.list.stream()
|
||||
.map(ILoggingEvent::getFormattedMessage)
|
||||
.filter(m -> m.contains("[task-resume] 生效配置"))
|
||||
.findFirst()
|
||||
.orElse("");
|
||||
assertTrue(line.contains("enabled=false"), "启动必须说得清续跑到底开没开:<" + line + ">");
|
||||
assertTrue(line.contains("maxAttempt=3"), line);
|
||||
assertTrue(line.contains("windowMinutes=30"), line);
|
||||
assertTrue(line.contains("modules=[SIMILAR_ASIN]"), line);
|
||||
} finally {
|
||||
logger.detachAppender(appender);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user