From 8e7bbe4de1ab0ef3aec5b3d35995cf3013abd9ed Mon Sep 17 00:00:00 2001 From: Tq Date: Thu, 7 Apr 2022 17:15:15 +0800 Subject: [PATCH 1/2] fix ProcessInstance wrong alert group id --- .../api/service/impl/ProcessInstanceServiceImpl.java | 1 - 1 file changed, 1 deletion(-) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java index 902b3a495c7c..c91bcfd217e4 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java @@ -214,7 +214,6 @@ public Map queryProcessInstanceById(User loginUser, long project if (processDefinition == null || projectCode != processDefinition.getProjectCode()) { putMsg(result, Status.PROCESS_DEFINE_NOT_EXIST, processId); } else { - processInstance.setWarningGroupId(processDefinition.getWarningGroupId()); processInstance.setLocations(processDefinition.getLocations()); processInstance.setDagData(processService.genDagData(processDefinition)); result.put(DATA_LIST, processInstance); From df5330a39a3608fea5f7001f75c4c3c85ee7ae36 Mon Sep 17 00:00:00 2001 From: Tq Date: Thu, 7 Apr 2022 18:34:32 +0800 Subject: [PATCH 2/2] change createComplementCommandList method to protected --- .../dolphinscheduler/api/service/impl/ExecutorServiceImpl.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java index a14ac46124c0..093771d01d48 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java @@ -619,7 +619,7 @@ private int createCommand(CommandType commandType, long processDefineCode, * @param runMode * @return */ - private int createComplementCommandList(Date start, Date end, RunMode runMode, Command command, + protected int createComplementCommandList(Date start, Date end, RunMode runMode, Command command, Integer expectedParallelismNumber, ComplementDependentMode complementDependentMode) { int createCount = 0; int dependentProcessDefinitionCreateCount = 0;