From 1fb21cee5f55eda67d229212dcd0b9236344e334 Mon Sep 17 00:00:00 2001 From: opensnail <598092184@qq.com> Date: Wed, 19 Jun 2024 23:18:22 +0800 Subject: [PATCH] =?UTF-8?q?feat(sj=5F1.1.0):=20=E4=BC=98=E5=8C=96=E5=AE=A2?= =?UTF-8?q?=E6=88=B7=E7=AB=AF=E4=BC=A0=E9=80=92=E4=B8=8A=E4=B8=8B=E6=96=87?= =?UTF-8?q?=201.=20=E4=BC=98=E5=8C=96=E5=88=86=E5=B8=83=E5=BC=8F=E9=94=81?= =?UTF-8?q?=E7=9A=84=E9=87=8D=E8=AF=95=E9=97=B4=E9=9A=94=E9=87=87=E7=94=A8?= =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E9=97=B4=E9=9A=94=202.=E5=90=88=E5=B9=B6?= =?UTF-8?q?=E4=B8=8A=E4=B8=8B=E6=96=87=E9=87=8D=E8=AF=95=E9=87=87=E7=94=A8?= =?UTF-8?q?=E9=9A=8F=E6=9C=BA=E9=97=B4=E9=9A=94?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../task/support/generator/batch/WorkflowBatchGenerator.java | 4 ---- .../job/task/support/handler/DistributedLockHandler.java | 2 +- .../server/job/task/support/handler/WorkflowBatchHandler.java | 2 +- 3 files changed, 2 insertions(+), 6 deletions(-) diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/WorkflowBatchGenerator.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/WorkflowBatchGenerator.java index b3fc2fe6b..d0dd27d0a 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/WorkflowBatchGenerator.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/generator/batch/WorkflowBatchGenerator.java @@ -13,7 +13,6 @@ import com.aizuda.snailjob.template.datasource.persistence.po.WorkflowTaskBatch; import lombok.RequiredArgsConstructor; import lombok.extern.slf4j.Slf4j; import org.springframework.stereotype.Component; -import org.springframework.transaction.annotation.Transactional; import java.time.Duration; import java.util.Optional; @@ -29,7 +28,6 @@ import java.util.Optional; public class WorkflowBatchGenerator { private final WorkflowTaskBatchMapper workflowTaskBatchMapper; - @Transactional public void generateJobTaskBatch(WorkflowTaskBatchGeneratorContext context) { // 生成任务批次 @@ -53,7 +51,5 @@ public class WorkflowBatchGenerator { workflowTimerTaskDTO.setTaskExecutorScene(context.getTaskExecutorScene()); JobTimerWheel.registerWithWorkflow(() -> new WorkflowTimerTask(workflowTimerTaskDTO), Duration.ofMillis(delay)); -// JobTimerWheel.register(SyetemTaskTypeEnum.WORKFLOW.getType(), workflowTaskBatch.getId(), -// new WorkflowTimerTask(workflowTimerTaskDTO), delay, TimeUnit.MILLISECONDS); } } diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/DistributedLockHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/DistributedLockHandler.java index 1c3e38dc5..65d52aa13 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/DistributedLockHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/DistributedLockHandler.java @@ -43,7 +43,7 @@ public class DistributedLockHandler { Retryer retryer = RetryerBuilder.newBuilder() .retryIfResult(result -> result.equals(Boolean.FALSE)) .retryIfException(ex -> true) - .withWaitStrategy(WaitStrategies.fixedWait(sleepTime.toMillis(), TimeUnit.MILLISECONDS)) + .withWaitStrategy(WaitStrategies.randomWait(sleepTime.toMillis(), TimeUnit.MILLISECONDS)) .withStopStrategy(StopStrategies.stopAfterAttempt(maxRetryTimes)) .withRetryListener(new RetryListener() { @Override diff --git a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java index 546304513..7eb22eb2b 100644 --- a/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java +++ b/snail-job-server/snail-job-server-job-task/src/main/java/com/aizuda/snailjob/server/job/task/support/handler/WorkflowBatchHandler.java @@ -335,7 +335,7 @@ public class WorkflowBatchHandler { Retryer retryer = RetryerBuilder.newBuilder() .retryIfResult(result -> result.equals(Boolean.FALSE)) .retryIfException(ex -> true) - .withWaitStrategy(WaitStrategies.fixedWait(500, TimeUnit.MILLISECONDS)) + .withWaitStrategy(WaitStrategies.randomWait(1000, TimeUnit.MILLISECONDS)) // 重试3秒 .withStopStrategy(StopStrategies.stopAfterAttempt(3)) .withRetryListener(new RetryListener() {