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() {