diff --git a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/handler/WorkflowBatchHandler.java b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/handler/WorkflowBatchHandler.java index a797e877..f81e9e40 100644 --- a/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/handler/WorkflowBatchHandler.java +++ b/easy-retry-server/easy-retry-server-job-task/src/main/java/com/aizuda/easy/retry/server/job/task/support/handler/WorkflowBatchHandler.java @@ -215,10 +215,10 @@ public class WorkflowBatchHandler { // 说明没有后继节点了, 此时需要判断整个DAG是否全部执行完成 List jobTaskBatches = jobTaskBatchMapper.selectList(new LambdaQueryWrapper() .eq(JobTaskBatch::getWorkflowTaskBatchId, workflowTaskBatchId) - .in(JobTaskBatch::getWorkflowNodeId, graph.nodes()) + .in(JobTaskBatch::getWorkflowNodeId, graph.nodes()).orderByDesc(JobTaskBatch::getId) ); - Map jobTaskBatchMap = jobTaskBatches.stream().collect(Collectors.toMap(JobTaskBatch::getWorkflowNodeId, i -> i)); + Map jobTaskBatchMap = jobTaskBatches.stream().collect(Collectors.toMap(JobTaskBatch::getWorkflowNodeId, i -> i, (i,j) -> i)); checkWorkflowExecutor(SystemConstants.ROOT, workflowTaskBatchId, graph, jobTaskBatchMap); } diff --git a/easy-retry-server/easy-retry-server-starter/src/main/resources/easyretry.conf b/easy-retry-server/easy-retry-server-starter/src/main/resources/easyretry.conf index 19b1c9aa..83b3e1af 100644 --- a/easy-retry-server/easy-retry-server-starter/src/main/resources/easyretry.conf +++ b/easy-retry-server/easy-retry-server-starter/src/main/resources/easyretry.conf @@ -103,7 +103,7 @@ akka { type = "Dispatcher" executor = "thread-pool-executor" thread-pool-executor { - core-pool-size-min = 32 + core-pool-size-min = 64 core-pool-size-factor = 2.0 core-pool-size-max = 64 } @@ -114,7 +114,7 @@ akka { type = "Dispatcher" executor = "thread-pool-executor" thread-pool-executor { - core-pool-size-min = 64 + core-pool-size-min = 128 core-pool-size-factor = 2.0 core-pool-size-max = 128 }