From 5361f399422f2f16ceaf687d8f20fd1933e894a5 Mon Sep 17 00:00:00 2001 From: byteblogs168 <598092184@qq.com> Date: Thu, 14 Mar 2024 22:43:20 +0800 Subject: [PATCH] =?UTF-8?q?feat:=203.1.1=201.=20=E4=BF=AE=E6=94=B9?= =?UTF-8?q?=E6=97=A5=E5=BF=97=E7=BA=A7=E5=88=AB?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../server/job/task/support/dispatch/JobExecutorActor.java | 6 +++--- .../job/task/support/dispatch/JobExecutorResultActor.java | 2 +- .../server/job/task/support/dispatch/ScanJobTaskActor.java | 2 +- .../job/task/support/dispatch/WorkflowExecutorActor.java | 6 +++--- .../task/support/prepare/job/RunningJobPrepareHandler.java | 2 +- .../task/support/prepare/job/TerminalJobPrepareHandler.java | 2 +- .../job/task/support/prepare/job/WaitJobPrepareHandler.java | 2 +- .../request/ReportDispatchResultPostHttpRequestHandler.java | 2 +- .../retry/server/job/task/support/timer/JobTimerTask.java | 2 +- .../retry/server/job/task/support/timer/JobTimerWheel.java | 2 +- .../server/job/task/support/timer/WorkflowTimerTask.java | 2 +- 11 files changed, 15 insertions(+), 15 deletions(-) diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorActor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorActor.java index 4c7a896e..2a9019ec 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorActor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorActor.java @@ -79,7 +79,7 @@ public class JobExecutorActor extends AbstractActor { public Receive createReceive() { return receiveBuilder().match(TaskExecuteDTO.class, taskExecute -> { try { - log.info("准备执行任务. [{}] [{}]", LocalDateTime.now(), JsonUtil.toJsonString(taskExecute)); + log.debug("准备执行任务. [{}] [{}]", LocalDateTime.now(), JsonUtil.toJsonString(taskExecute)); transactionTemplate.execute(new TransactionCallbackWithoutResult() { @Override protected void doInTransactionWithoutResult(final TransactionStatus status) { @@ -148,7 +148,7 @@ public class JobExecutorActor extends AbstractActor { JobExecutor jobExecutor = JobExecutorFactory.getJobExecutor(job.getTaskType()); jobExecutor.execute(buildJobExecutorContext(taskExecute, job, taskList)); } finally { - log.info("准备执行任务完成.[{}]", JsonUtil.toJsonString(taskExecute)); + log.debug("准备执行任务完成.[{}]", JsonUtil.toJsonString(taskExecute)); TransactionSynchronizationManager.registerSynchronization(new TransactionSynchronization() { @Override public void afterCompletion(int status) { @@ -224,7 +224,7 @@ public class JobExecutorActor extends AbstractActor { // 获取时间差的毫秒数 long milliseconds = nextTriggerAt - preTriggerAt; - log.info("常驻任务监控. 任务时间差:[{}] 取余:[{}]", milliseconds, DateUtils.toNowMilli() % 1000); + log.debug("常驻任务监控. 任务时间差:[{}] 取余:[{}]", milliseconds, DateUtils.toNowMilli() % 1000); job.setNextTriggerAt(nextTriggerAt); JobTimerWheel.register(SyetemTaskTypeEnum.JOB.getType(), jobTimerTaskDTO.getTaskBatchId(), timerTask, milliseconds - DateUtils.toNowMilli() % 1000, TimeUnit.MILLISECONDS); diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorResultActor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorResultActor.java index 2605c1b7..8e5fcb23 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorResultActor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/JobExecutorResultActor.java @@ -58,7 +58,7 @@ public class JobExecutorResultActor extends AbstractActor { @Override public Receive createReceive() { return receiveBuilder().match(JobExecutorResultDTO.class, result -> { - log.info("更新任务状态. 参数:[{}]", JsonUtil.toJsonString(result)); + log.debug("更新任务状态. 参数:[{}]", JsonUtil.toJsonString(result)); try { JobTask jobTask = new JobTask(); jobTask.setTaskStatus(result.getTaskStatus()); diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/ScanJobTaskActor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/ScanJobTaskActor.java index bc8fe95b..386bd7a8 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/ScanJobTaskActor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/ScanJobTaskActor.java @@ -76,7 +76,7 @@ public class ScanJobTaskActor extends AbstractActor { long total = PartitionTaskUtils.process(startId -> listAvailableJobs(startId, scanTask), this::processJobPartitionTasks, 0); - log.info("job scan end. total:[{}]", total); + log.debug("job scan end. total:[{}]", total); } private void processJobPartitionTasks(List partitionTasks) { diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/WorkflowExecutorActor.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/WorkflowExecutorActor.java index 6f21d7f5..e2722c0d 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/WorkflowExecutorActor.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/dispatch/WorkflowExecutorActor.java @@ -63,7 +63,7 @@ public class WorkflowExecutorActor extends AbstractActor { @Override public Receive createReceive() { return receiveBuilder().match(WorkflowNodeTaskExecuteDTO.class, taskExecute -> { - log.info("工作流开始执行. [{}]", JsonUtil.toJsonString(taskExecute)); + log.debug("工作流开始执行. [{}]", JsonUtil.toJsonString(taskExecute)); try { doExecutor(taskExecute); @@ -195,14 +195,14 @@ public class WorkflowExecutorActor extends AbstractActor { List jobTaskBatches = jobTaskBatchMap.get(nodeId); // 说明此节点未执行, 继续等待执行完成 if (CollectionUtils.isEmpty(jobTaskBatches)) { - EasyRetryLog.LOCAL.info("存在未完成的兄弟节点. [{}]", nodeId); + EasyRetryLog.LOCAL.debug("存在未完成的兄弟节点. [{}]", nodeId); return Boolean.FALSE; } boolean isCompleted = jobTaskBatches.stream().anyMatch( jobTaskBatch -> JobTaskBatchStatusEnum.NOT_COMPLETE.contains(jobTaskBatch.getTaskBatchStatus())); if (isCompleted) { - EasyRetryLog.LOCAL.info("存在未完成的兄弟节点. [{}]", nodeId); + EasyRetryLog.LOCAL.debug("存在未完成的兄弟节点. [{}]", nodeId); return Boolean.FALSE; } } diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/job/RunningJobPrepareHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/job/RunningJobPrepareHandler.java index cf7f32d2..96c2765c 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/job/RunningJobPrepareHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/job/RunningJobPrepareHandler.java @@ -40,7 +40,7 @@ public class RunningJobPrepareHandler extends AbstractJobPrePareHandler { @Override protected void doHandler(JobTaskPrepareDTO prepare) { - log.info("存在运行中的任务. prepare:[{}]", JsonUtil.toJsonString(prepare)); + log.debug("存在运行中的任务. prepare:[{}]", JsonUtil.toJsonString(prepare)); // 若存在所有的任务都是完成，但是批次上的状态为运行中，则是并发导致的未把批次状态变成为终态，此处做一次兜底处理 int blockStrategy = prepare.getBlockStrategy(); diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/job/TerminalJobPrepareHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/job/TerminalJobPrepareHandler.java index 0839aea7..dbd820cb 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/job/TerminalJobPrepareHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/job/TerminalJobPrepareHandler.java @@ -35,7 +35,7 @@ public class TerminalJobPrepareHandler extends AbstractJobPrePareHandler { @Override protected void doHandler(JobTaskPrepareDTO jobPrepareDTO) { - log.info("无处理中的数据. jobId:[{}]", jobPrepareDTO.getJobId()); + log.debug("无处理中的数据. jobId:[{}]", jobPrepareDTO.getJobId()); // 生成任务批次 jobTaskBatchGenerator.generateJobTaskBatch(JobTaskConverter.INSTANCE.toJobTaskGeneratorContext(jobPrepareDTO)); diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/job/WaitJobPrepareHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/job/WaitJobPrepareHandler.java index 8dacb63f..5fdf67f4 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/job/WaitJobPrepareHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/prepare/job/WaitJobPrepareHandler.java @@ -30,7 +30,7 @@ public class WaitJobPrepareHandler extends AbstractJobPrePareHandler { @Override protected void doHandler(JobTaskPrepareDTO jobPrepareDTO) { - log.info("存在待处理任务. taskBatchId:[{}]", jobPrepareDTO.getTaskBatchId()); + log.debug("存在待处理任务. taskBatchId:[{}]", jobPrepareDTO.getTaskBatchId()); // 若时间轮中数据不存在则重新加入 if (!JobTimerWheel.isExisted(SyetemTaskTypeEnum.JOB.getType(), jobPrepareDTO.getTaskBatchId())) { diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/request/ReportDispatchResultPostHttpRequestHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/request/ReportDispatchResultPostHttpRequestHandler.java index e4f17fec..2fb6a1b5 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/request/ReportDispatchResultPostHttpRequestHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/request/ReportDispatchResultPostHttpRequestHandler.java @@ -41,7 +41,7 @@ public class ReportDispatchResultPostHttpRequestHandler extends PostHttpRequestH @Override public String doHandler(String content, UrlQuery query, HttpHeaders headers) { - EasyRetryLog.LOCAL.info("Client Callback Request. content:[{}]", content); + EasyRetryLog.LOCAL.debug("Client Callback Request. content:[{}]", content); EasyRetryRequest retryRequest = JsonUtil.parseObject(content, EasyRetryRequest.class); Object[] args = retryRequest.getArgs(); diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerTask.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerTask.java index 6a11f8f6..a053b944 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerTask.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerTask.java @@ -25,7 +25,7 @@ public class JobTimerTask implements TimerTask { @Override public void run(final Timeout timeout) throws Exception { // 执行任务调度 - log.info("开始执行任务调度. 当前时间:[{}] taskId:[{}]", LocalDateTime.now(), jobTimerTaskDTO.getTaskBatchId()); + log.debug("开始执行任务调度. 当前时间:[{}] taskId:[{}]", LocalDateTime.now(), jobTimerTaskDTO.getTaskBatchId()); try { TaskExecuteDTO taskExecuteDTO = new TaskExecuteDTO(); diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerWheel.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerWheel.java index 6e89d0f1..5b165f02 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerWheel.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/JobTimerWheel.java @@ -44,7 +44,7 @@ public class JobTimerWheel implements Lifecycle { public static void register(Integer taskType, Long uniqueId, TimerTask task, long delay, TimeUnit unit) { if (!isExisted(taskType, uniqueId)) { - log.info("加入时间轮. delay:[{}ms] taskType:[{}] uniqueId:[{}]", delay, taskType, uniqueId); + log.debug("加入时间轮. delay:[{}ms] taskType:[{}] uniqueId:[{}]", delay, taskType, uniqueId); delay = delay < 0 ? 0 : delay; try { timer.newTimeout(task, delay, unit); diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/WorkflowTimerTask.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/WorkflowTimerTask.java index 535d5081..fcd81956 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/WorkflowTimerTask.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/timer/WorkflowTimerTask.java @@ -26,7 +26,7 @@ public class WorkflowTimerTask implements TimerTask { @Override public void run(final Timeout timeout) throws Exception { // 执行任务调度 - log.info("开始执行任务调度. 当前时间:[{}] taskId:[{}]", LocalDateTime.now(), workflowTimerTaskDTO.getWorkflowTaskBatchId()); + log.debug("开始执行任务调度. 当前时间:[{}] taskId:[{}]", LocalDateTime.now(), workflowTimerTaskDTO.getWorkflowTaskBatchId()); try {