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

fix(sj_1.3.0-beta1.1):

Browse Source 
1、修复重试无客户端告警空指针异常
2、修复Slf4jLog远程日志上报清除的问题
This commit is contained in:
zhengweilin 2025-02-25 15:16:21 +08:00 committed by opensnail
parent bce08ed3f8
commit 460f13a2d4
5 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
snail-job-common/snail-job-common-log/src/main/java/com/aizuda/snailjob/common/log/dialect/slf4j/Slf4jLog.java
View File

@ -213,9 +213,7 @@ public class Slf4jLog extends AbstractLog {
*/
private void setContextMap(Boolean remote) {
if (remote) {
Map<String, String> map = new LinkedHashMap<>();
map.put(LogFieldConstants.MDC_REMOTE, remote.toString());
MDC.setContextMap(map);
MDC.put(LogFieldConstants.MDC_REMOTE, remote.toString());
}
}
}

4
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/dispatch/JobExecutorActor.java
View File

@ -126,7 +126,7 @@ public class JobExecutorActor extends AbstractActor {
}
// 无客户端节点-告警通知
if (JobTaskBatchStatusEnum.CANCEL.getStatus() == taskStatus && JobOperationReasonEnum.NOT_CLIENT.getReason() == operationReason) {
if (CollUtil.isEmpty(CacheRegisterTable.getServerNodeSet(job.getGroupName(), job.getNamespaceId()))) {
SnailSpringContext.getContext().publishEvent(
new JobTaskFailAlarmEvent(JobTaskFailAlarmEventDTO.builder()
.jobTaskBatchId(taskExecute.getTaskBatchId())
@ -148,7 +148,7 @@ public class JobExecutorActor extends AbstractActor {
JobTaskGenerator taskInstance = JobTaskGeneratorFactory.getTaskInstance(job.getTaskType());
JobTaskGenerateContext instanceGenerateContext = JobTaskConverter.INSTANCE.toJobTaskInstanceGenerateContext(job);
instanceGenerateContext.setTaskBatchId(taskExecute.getTaskBatchId());
if (Objects.nonNull(taskExecute.getTmpArgsStr())){
if (Objects.nonNull(taskExecute.getTmpArgsStr())) {
instanceGenerateContext.setArgsStr(taskExecute.getTmpArgsStr());
}
if (Lists.newArrayList(MAP_REDUCE.getType(), MAP.getType()).contains(job.getTaskType())) {

1
snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/JobTaskBatchGenerator.java
View File

@ -92,6 +92,7 @@ public class JobTaskBatchGenerator {
.reason(JobNotifySceneEnum.JOB_NO_CLIENT_NODES_ERROR.getDesc())
.notifyScene(JobNotifySceneEnum.JOB_NO_CLIENT_NODES_ERROR.getNotifyScene())
.build()));
return jobTaskBatch;
}
// 非待处理状态无需进入时间轮中

2
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailAlarmListener.java
View File

@ -95,7 +95,7 @@ public class RetryTaskFailAlarmListener extends
retryAlarmInfo.getExecutorName(),
retryAlarmInfo.getSceneName(),
retryAlarmInfo.getArgsStr(),
DateUtils.format(retryAlarmInfo.getCreateDt(), DateUtils.NORM_DATETIME_PATTERN),
DateUtils.toNowFormat(DateUtils.NORM_DATETIME_PATTERN),
retryAlarmInfo.getReason())
.title("组:[{}] 场景:[{}] 环境重试任务失败",
retryAlarmInfo.getGroupName(), retryAlarmInfo.getSceneName());

2
snail-job-server/snail-job-server-retry-task/src/main/java/com/aizuda/snailjob/server/retry/task/support/listener/RetryTaskFailDeadLetterAlarmListener.java
View File

@ -87,7 +87,7 @@ public class RetryTaskFailDeadLetterAlarmListener extends
retryAlarmInfo.getExecutorName(),
retryAlarmInfo.getSceneName(),
retryAlarmInfo.getArgsStr(),
DateUtils.format(retryAlarmInfo.getCreateDt(), DateUtils.NORM_DATETIME_PATTERN))
DateUtils.toNowFormat(DateUtils.NORM_DATETIME_PATTERN))
.title("组:[{}] 场景:[{}] 环境重试任务失败进入死信队列",
retryAlarmInfo.getGroupName(), retryAlarmInfo.getSceneName());
}