gtsoft/gtsoft-snail-job-server
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects 1 Releases Wiki Activity

feat(1.5.0-beta1): 调试任务重试

Browse Source
This commit is contained in:
opensnail 2025-04-08 23:47:10 +08:00
parent 8916f3dfb8
commit de25b70764
3 changed files with 7 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
snail-job-datasource/snail-job-datasource-template/src/main/java/com/aizuda/snailjob/template/datasource/persistence/po/Retry.java
View File

@ -23,11 +23,11 @@ public class Retry extends CreateUpdateDt {
private String groupName; private String groupName;
private String groupId; private Long groupId;
private String sceneName; private String sceneName;
private String sceneId; private Long sceneId;
private String idempotentId; private String idempotentId;

7
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/dispatch/ScanRetryActor.java
View File

@ -151,7 +151,7 @@ public class ScanRetryActor extends AbstractActor {
.select(RetrySceneConfig::getBackOff, RetrySceneConfig::getTriggerInterval, .select(RetrySceneConfig::getBackOff, RetrySceneConfig::getTriggerInterval,
RetrySceneConfig::getBlockStrategy, RetrySceneConfig::getSceneName, RetrySceneConfig::getBlockStrategy, RetrySceneConfig::getSceneName,
RetrySceneConfig::getCbTriggerType, RetrySceneConfig::getCbTriggerInterval, RetrySceneConfig::getCbTriggerType, RetrySceneConfig::getCbTriggerInterval,
RetrySceneConfig::getExecutorTimeout) RetrySceneConfig::getExecutorTimeout, RetrySceneConfig::getId)
.eq(RetrySceneConfig::getSceneStatus, StatusEnum.YES.getStatus()) .eq(RetrySceneConfig::getSceneStatus, StatusEnum.YES.getStatus())
.in(RetrySceneConfig::getId, sceneIdSet)); .in(RetrySceneConfig::getId, sceneIdSet));
return StreamUtils.toIdentityMap(retrySceneConfigs, RetrySceneConfig::getId); return StreamUtils.toIdentityMap(retrySceneConfigs, RetrySceneConfig::getId);
@ -203,7 +203,8 @@ public class ScanRetryActor extends AbstractActor {
.listPage(new PageDTO<>(0, systemProperties.getRetryPullPageSize(), Boolean.FALSE), .listPage(new PageDTO<>(0, systemProperties.getRetryPullPageSize(), Boolean.FALSE),
new LambdaQueryWrapper<Retry>() new LambdaQueryWrapper<Retry>()
.select(Retry::getId, Retry::getNextTriggerAt, Retry::getGroupName, Retry::getRetryCount, .select(Retry::getId, Retry::getNextTriggerAt, Retry::getGroupName, Retry::getRetryCount,
Retry::getSceneName, Retry::getNamespaceId, Retry::getTaskType) Retry::getSceneName, Retry::getNamespaceId, Retry::getTaskType,
Retry::getSceneId, Retry::getGroupId)
.eq(Retry::getRetryStatus, RetryStatusEnum.RUNNING.getStatus()) .eq(Retry::getRetryStatus, RetryStatusEnum.RUNNING.getStatus())
.in(Retry::getBucketIndex, buckets) .in(Retry::getBucketIndex, buckets)
.le(Retry::getNextTriggerAt, DateUtils.toNowMilli() + DateUtils.toEpochMilli(SystemConstants.SCHEDULE_PERIOD)) .le(Retry::getNextTriggerAt, DateUtils.toNowMilli() + DateUtils.toEpochMilli(SystemConstants.SCHEDULE_PERIOD))
@ -219,7 +220,7 @@ public class ScanRetryActor extends AbstractActor {
.eq(GroupConfig::getGroupStatus, StatusEnum.YES.getStatus()) .eq(GroupConfig::getGroupStatus, StatusEnum.YES.getStatus())
.in(GroupConfig::getId, StreamUtils.toSet(retries, Retry::getGroupId))), .in(GroupConfig::getId, StreamUtils.toSet(retries, Retry::getGroupId))),
GroupConfig::getId); GroupConfig::getId);
retries = retries.stream().filter(retry -> groupConfigs.contains(retry.getId())).collect(Collectors.toList()); retries = retries.stream().filter(retry -> groupConfigs.contains(retry.getGroupId())).collect(Collectors.toList());
} }
return RetryTaskConverter.INSTANCE.toRetryPartitionTasks(retries); return RetryTaskConverter.INSTANCE.toRetryPartitionTasks(retries);

1
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/handler/RetryTaskStopHandler.java
View File

@ -43,6 +43,7 @@ public class RetryTaskStopHandler {
RetryExecutorResultDTO executorResultDTO = RetryTaskConverter.INSTANCE.toRetryExecutorResultDTO(stopJobDTO); RetryExecutorResultDTO executorResultDTO = RetryTaskConverter.INSTANCE.toRetryExecutorResultDTO(stopJobDTO);
executorResultDTO.setExceptionMsg(stopJobDTO.getMessage()); executorResultDTO.setExceptionMsg(stopJobDTO.getMessage());
executorResultDTO.setTaskStatus(RetryTaskStatusEnum.FAIL.getStatus()); executorResultDTO.setTaskStatus(RetryTaskStatusEnum.FAIL.getStatus());
executorResultDTO.setIncrementRetryCount(true);
executorResultDTO.setOperationReason(stopJobDTO.getOperationReason()); executorResultDTO.setOperationReason(stopJobDTO.getOperationReason());
ActorRef actorRef = ActorGenerator.retryTaskExecutorResultActor(); ActorRef actorRef = ActorGenerator.retryTaskExecutorResultActor();
actorRef.tell(executorResultDTO, actorRef); actorRef.tell(executorResultDTO, actorRef);