feat(任务派发): 客户端兜底拉取页面未推送成功的任务 + 修店铺匹配定时任务误杀
问题:任务派发链路的"推送"只存在于页面里(Java 解析落库 PENDING → activate → pywebview 桥 enqueue_json 推本机队列)。只解析没点启动、推送前关页面、在纯浏览器 打开,任务都会停在 PENDING,2 小时后被 StaleTaskRepairService 标失败 (「任务长期未被领取,已自动失败」,09-11 生产清理过 263 条同画像)。 - 服务端新增 GET /api/tasks/pull-pending(TaskClientPullController,身份从 JWT 取, 不接受 user_id 参数):只挑创建超 5 分钟仍 PENDING 的本用户任务,逐条条件更新认领 (PENDING→RUNNING + 接管 owner_instance_id)——与页面 activate 同一谓词,天然互斥, 不会重复执行;认领后组装不出载荷则标 FAILED,不留 RUNNING 孤儿 - payload 由各业务模块实现 ClientTaskPullSpi 组装(task 侧不 import 业务模块,同 G5): 首批 SIMILAR_ASIN / COLLECT_DATA / APPEARANCE_PATENT——这三个 Python 消费端会自行 回拉明细,故载荷极简、客户端零模块知识;开关 aiimage.client-task-pull.enabled 默认 false - 防双执行:三处 activate 由「非终态即可」收紧为只认 PENDING,未命中抛 「任务已在执行中(可能已由客户端自动接管),无需重复启动」(顺带堵住整行 updateById 把认领写入的 owner 覆盖回去的竞态);两个前端页 activate 失败即提示并停止入队 - 客户端:amazon/main.py 新增 pending_task_pull_worker,启动点挂在 app_client/main.py 的 start_task_monitor(独立入口的 worker 线上并不生效);开关 pending_pull_enabled 用 getattr 读取,避免 test/ 下的旧 config 缺键导致整包导入失败 - 同批修:StaleTaskRepairService 的 SCHEDULED 分支改按 scheduled_at + 120min 判死 (原按 updated_at 会必杀排期 >2h 的店铺匹配定时任务,而 activate 又被 scheduledAt-90s 挡住) - 测试:TaskClientPullServiceTest / StaleTaskRepairServiceTest / CollectDataTaskPullSpiImplTest / CollectDataActivateGuardTest 共 20 例;客户端 pending_task_pull_worker 7 例并更新启动顺序契约测试
This commit is contained in:
+163
@@ -0,0 +1,163 @@
|
||||
package com.nanri.aiimage.modules.collectdata.service;
|
||||
|
||||
import com.baomidou.mybatisplus.core.MybatisConfiguration;
|
||||
import com.baomidou.mybatisplus.core.conditions.Wrapper;
|
||||
import com.baomidou.mybatisplus.core.metadata.TableInfoHelper;
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.nanri.aiimage.common.exception.BusinessException;
|
||||
import com.nanri.aiimage.common.service.DistributedJobLockService;
|
||||
import com.nanri.aiimage.modules.collectdata.util.CollectDataBatchQuery;
|
||||
import com.nanri.aiimage.modules.collectdata.util.CollectDataBrandBatchFilter;
|
||||
import com.nanri.aiimage.modules.collectdata.util.CollectDataInvalidAsinBatchWriter;
|
||||
import com.nanri.aiimage.modules.collectdata.util.CollectDataResultDetailCodec;
|
||||
import com.nanri.aiimage.modules.collectdata.util.CollectDataResultDetailReader;
|
||||
import com.nanri.aiimage.modules.collectdata.util.CollectDataResultItemBatchWriter;
|
||||
import com.nanri.aiimage.modules.file.service.oss.OssStorageService;
|
||||
import com.nanri.aiimage.modules.invalidasin.mapper.InvalidAsinDataMapper;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileResultMapper;
|
||||
import com.nanri.aiimage.modules.task.mapper.FileTaskMapper;
|
||||
import com.nanri.aiimage.modules.task.mapper.TaskChunkMapper;
|
||||
import com.nanri.aiimage.modules.task.mapper.TaskResultItemMapper;
|
||||
import com.nanri.aiimage.modules.task.mapper.TaskScopeStateMapper;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import com.nanri.aiimage.modules.task.service.TaskDistributedLockService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskFileJobService;
|
||||
import com.nanri.aiimage.modules.task.service.TaskProgressLightAssembler;
|
||||
import com.nanri.aiimage.modules.task.service.TransientPayloadStorageService;
|
||||
import org.apache.ibatis.builder.MapperBuilderAssistant;
|
||||
import org.junit.jupiter.api.BeforeEach;
|
||||
import org.junit.jupiter.api.Test;
|
||||
import org.mockito.ArgumentCaptor;
|
||||
import org.springframework.test.util.ReflectionTestUtils;
|
||||
import org.springframework.transaction.PlatformTransactionManager;
|
||||
import org.springframework.transaction.support.TransactionTemplate;
|
||||
|
||||
import java.util.Map;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertNotNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertThrows;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
import static org.mockito.ArgumentMatchers.any;
|
||||
import static org.mockito.ArgumentMatchers.isNull;
|
||||
import static org.mockito.Mockito.mock;
|
||||
import static org.mockito.Mockito.never;
|
||||
import static org.mockito.Mockito.verify;
|
||||
import static org.mockito.Mockito.when;
|
||||
|
||||
/**
|
||||
* activate 收紧契约(2026-09-14):只允许 PENDING→RUNNING。
|
||||
*
|
||||
* <p>任务被客户端「兜底拉取」领走后已是 RUNNING,页面再点启动必须被拒且不改状态 ——
|
||||
* 否则同一任务会被执行两次(页面入队一次、客户端一次)。同理,已结束的任务不能被复活。
|
||||
*/
|
||||
class CollectDataActivateGuardTest {
|
||||
|
||||
private static final long USER_ID = 1095L;
|
||||
private static final long TASK_ID = 11L;
|
||||
|
||||
private final FileTaskMapper fileTaskMapper = mock(FileTaskMapper.class);
|
||||
private CollectDataService service;
|
||||
|
||||
@BeforeEach
|
||||
void setUp() {
|
||||
// LambdaWrapper 需要实体列缓存,单测无 Spring/MyBatis 上下文,手动初始化
|
||||
TableInfoHelper.initTableInfo(new MapperBuilderAssistant(new MybatisConfiguration(), ""), FileTaskEntity.class);
|
||||
service = buildService(fileTaskMapper);
|
||||
}
|
||||
|
||||
@Test
|
||||
void 已被客户端领走时拒绝重复启动() {
|
||||
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task("RUNNING"));
|
||||
|
||||
BusinessException error = assertThrows(BusinessException.class,
|
||||
() -> service.activateTask(TASK_ID, USER_ID));
|
||||
|
||||
assertTrue(error.getMessage().contains("无需重复启动"), "错误信息应说明任务已在执行中:" + error.getMessage());
|
||||
// 只有一次条件更新,且谓词限定 PENDING —— 已被客户端认领(RUNNING)的行不可能被再翻一次
|
||||
ArgumentCaptor<Wrapper<FileTaskEntity>> captor = wrapperCaptor();
|
||||
verify(fileTaskMapper).update(isNull(), captor.capture());
|
||||
assertTrue(paramsOf(captor.getValue()).containsValue("PENDING"),
|
||||
"条件更新必须限定 PENDING,否则已认领的任务会被重复执行");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 已结束的任务不能被复活() {
|
||||
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task("SUCCESS"));
|
||||
|
||||
BusinessException error = assertThrows(BusinessException.class,
|
||||
() -> service.activateTask(TASK_ID, USER_ID));
|
||||
|
||||
assertEquals("任务已结束", error.getMessage());
|
||||
ArgumentCaptor<Wrapper<FileTaskEntity>> captor = wrapperCaptor();
|
||||
verify(fileTaskMapper).update(isNull(), captor.capture());
|
||||
assertTrue(paramsOf(captor.getValue()).containsValue("PENDING"),
|
||||
"已结束的任务不能命中条件更新");
|
||||
}
|
||||
|
||||
@Test
|
||||
void 非本用户的任务被拒() {
|
||||
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task("PENDING"));
|
||||
|
||||
assertThrows(BusinessException.class, () -> service.activateTask(TASK_ID, USER_ID + 1));
|
||||
verify(fileTaskMapper, never()).update(isNull(), any());
|
||||
}
|
||||
|
||||
@Test
|
||||
void PENDING_任务激活成功且条件更新限定_PENDING() {
|
||||
when(fileTaskMapper.selectById(TASK_ID)).thenReturn(task("PENDING"));
|
||||
when(fileTaskMapper.update(isNull(), any())).thenReturn(1);
|
||||
|
||||
service.activateTask(TASK_ID, USER_ID);
|
||||
|
||||
ArgumentCaptor<Wrapper<FileTaskEntity>> captor = wrapperCaptor();
|
||||
verify(fileTaskMapper).update(isNull(), captor.capture());
|
||||
Map<String, Object> params = paramsOf(captor.getValue());
|
||||
assertTrue(params.containsValue("PENDING"), "条件更新的谓词必须限定 PENDING");
|
||||
assertTrue(params.containsValue("RUNNING"), "条件更新必须写入 RUNNING");
|
||||
}
|
||||
|
||||
private static FileTaskEntity task(String status) {
|
||||
FileTaskEntity task = new FileTaskEntity();
|
||||
task.setId(TASK_ID);
|
||||
task.setModuleType("COLLECT_DATA");
|
||||
task.setTaskNo("COLLECT_DATA-11");
|
||||
task.setUserId(USER_ID);
|
||||
task.setStatus(status);
|
||||
return task;
|
||||
}
|
||||
|
||||
/** 复用既有测试的服务装配方式:只关心 activateTask 用到的 fileTaskMapper,其余协作者为 mock。 */
|
||||
private static CollectDataService buildService(FileTaskMapper fileTaskMapper) {
|
||||
PlatformTransactionManager transactionManager = mock(PlatformTransactionManager.class);
|
||||
return new CollectDataService(null, fileTaskMapper, mock(FileResultMapper.class),
|
||||
mock(com.nanri.aiimage.modules.collectdata.mapper.CollectDataItemMapper.class),
|
||||
mock(com.nanri.aiimage.modules.collectdata.mapper.CollectDataCountryPrefMapper.class),
|
||||
mock(InvalidAsinDataMapper.class),
|
||||
mock(TaskChunkMapper.class), mock(TaskScopeStateMapper.class), mock(TaskResultItemMapper.class),
|
||||
mock(TaskDistributedLockService.class), mock(TaskFileJobService.class),
|
||||
mock(TransientPayloadStorageService.class),
|
||||
mock(CollectDataExcelAssemblyService.class), mock(OssStorageService.class),
|
||||
new ObjectMapper(), new TransactionTemplate(transactionManager),
|
||||
mock(DistributedJobLockService.class),
|
||||
mock(CollectDataBatchQuery.class), mock(CollectDataBrandBatchFilter.class),
|
||||
mock(CollectDataInvalidAsinBatchWriter.class), mock(CollectDataResultDetailCodec.class),
|
||||
mock(CollectDataResultItemBatchWriter.class), mock(CollectDataResultDetailReader.class),
|
||||
mock(TaskProgressLightAssembler.class));
|
||||
}
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
private static ArgumentCaptor<Wrapper<FileTaskEntity>> wrapperCaptor() {
|
||||
return ArgumentCaptor.forClass(Wrapper.class);
|
||||
}
|
||||
|
||||
/** 读取 wrapper 参数容器:MyBatis-Plus 在生成 SQL 片段时才填充,故先触发一次。 */
|
||||
@SuppressWarnings("unchecked")
|
||||
private static Map<String, Object> paramsOf(Wrapper<FileTaskEntity> wrapper) {
|
||||
wrapper.getSqlSegment();
|
||||
((com.baomidou.mybatisplus.core.conditions.update.LambdaUpdateWrapper<FileTaskEntity>) wrapper).getSqlSet();
|
||||
Map<String, Object> params = (Map<String, Object>) ReflectionTestUtils.getField(wrapper, "paramNameValuePairs");
|
||||
assertNotNull(params, "wrapper 参数容器字段名可能已变化(paramNameValuePairs)");
|
||||
return params;
|
||||
}
|
||||
}
|
||||
+100
@@ -0,0 +1,100 @@
|
||||
package com.nanri.aiimage.modules.collectdata.service;
|
||||
|
||||
import com.fasterxml.jackson.databind.ObjectMapper;
|
||||
import com.nanri.aiimage.modules.task.model.entity.FileTaskEntity;
|
||||
import org.junit.jupiter.api.Test;
|
||||
|
||||
import java.util.List;
|
||||
import java.util.Map;
|
||||
|
||||
import static org.junit.jupiter.api.Assertions.assertEquals;
|
||||
import static org.junit.jupiter.api.Assertions.assertNull;
|
||||
import static org.junit.jupiter.api.Assertions.assertTrue;
|
||||
|
||||
/**
|
||||
* 集采兜底载荷契约(与 Python SearchTask 的读取口径对齐):
|
||||
* filters 原样透传(Python 读 countryCode/minAmount/maxAmount/rank/fba/fbm 这些 camelCase 键)、
|
||||
* totalRows 取任务 result_json 的初始统计、pageSize 固定 50;
|
||||
* request_json 缺失/不可解析时返回 null —— 由调用方标失败,绝不用默认国家"凑"一次采集。
|
||||
*/
|
||||
class CollectDataTaskPullSpiImplTest {
|
||||
|
||||
private final CollectDataTaskPullSpiImpl spi = new CollectDataTaskPullSpiImpl(new ObjectMapper());
|
||||
|
||||
@Test
|
||||
void 载荷包含明细拉取所需的全部字段() {
|
||||
FileTaskEntity task = task("""
|
||||
{"userId":1095,"taskType":"collect-data",
|
||||
"filters":{"countryCode":"DE","minAmount":10.5,"maxAmount":99.9,"rank":true,"fba":false,"fbm":true},
|
||||
"files":[]}""", """
|
||||
{"totalRows":81}""");
|
||||
|
||||
Map<String, Object> payload = spi.buildQueuePayload(task);
|
||||
|
||||
assertEquals("collect-data-run", payload.get("type"));
|
||||
@SuppressWarnings("unchecked")
|
||||
Map<String, Object> data = (Map<String, Object>) payload.get("data");
|
||||
assertEquals(11L, data.get("taskId"));
|
||||
assertEquals("COLLECT_DATA-11", data.get("taskNo"));
|
||||
assertEquals("collect-data", data.get("taskType"));
|
||||
assertEquals(81, data.get("totalRows"));
|
||||
assertEquals(CollectDataService.DEFAULT_PAGE_SIZE, data.get("pageSize"));
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
Map<String, Object> filters = (Map<String, Object>) data.get("filters");
|
||||
assertEquals("DE", filters.get("countryCode"));
|
||||
assertEquals(10.5, filters.get("minAmount"));
|
||||
assertEquals(99.9, filters.get("maxAmount"));
|
||||
assertEquals(true, filters.get("rank"));
|
||||
assertEquals(false, filters.get("fba"));
|
||||
assertEquals(true, filters.get("fbm"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void 模块类型与入队类型固定() {
|
||||
assertEquals("COLLECT_DATA", spi.moduleType());
|
||||
assertEquals("collect-data-run", spi.buildQueuePayload(task("{\"filters\":{}}", "{}")).get("type"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void 结果统计缺失时_totalRows_为_0() {
|
||||
Map<String, Object> payload = spi.buildQueuePayload(task("{\"filters\":{}}", null));
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
Map<String, Object> data = (Map<String, Object>) payload.get("data");
|
||||
assertEquals(0, data.get("totalRows"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void filters_为空时透传空对象由_python_默认值兜底() {
|
||||
Map<String, Object> payload = spi.buildQueuePayload(task("{\"filters\":null}", "{}"));
|
||||
|
||||
@SuppressWarnings("unchecked")
|
||||
Map<String, Object> data = (Map<String, Object>) payload.get("data");
|
||||
assertEquals(Map.of(), data.get("filters"));
|
||||
}
|
||||
|
||||
@Test
|
||||
void 请求参数缺失或不可解析时返回_null_由调用方标失败() {
|
||||
assertNull(spi.buildQueuePayload(task(null, "{}")));
|
||||
assertNull(spi.buildQueuePayload(task("not-a-json", "{}")));
|
||||
}
|
||||
|
||||
private static FileTaskEntity task(String requestJson, String resultJson) {
|
||||
FileTaskEntity task = new FileTaskEntity();
|
||||
task.setId(11L);
|
||||
task.setTaskNo("COLLECT_DATA-11");
|
||||
task.setModuleType("COLLECT_DATA");
|
||||
task.setUserId(1095L);
|
||||
task.setStatus("PENDING");
|
||||
task.setRequestJson(requestJson);
|
||||
task.setResultJson(resultJson);
|
||||
return task;
|
||||
}
|
||||
|
||||
/** 防回归:whitelist 里的模块类型必须与业务模块常量一致(配置默认值写的是字符串)。 */
|
||||
@Test
|
||||
void 模块类型常量未被改名() {
|
||||
assertTrue(List.of("SIMILAR_ASIN", "COLLECT_DATA", "APPEARANCE_PATENT").contains(spi.moduleType()));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user