diff --git a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataAnalysisServiceImpl.java b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataAnalysisServiceImpl.java index 21313b96d3..e2cdec3aff 100644 --- a/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataAnalysisServiceImpl.java +++ b/dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataAnalysisServiceImpl.java @@ -26,6 +26,7 @@ import org.apache.dolphinscheduler.api.service.DataAnalysisService; import org.apache.dolphinscheduler.api.service.ProjectService; import org.apache.dolphinscheduler.common.Constants; import org.apache.dolphinscheduler.common.enums.CommandType; +import org.apache.dolphinscheduler.common.enums.ExecutionStatus; import org.apache.dolphinscheduler.common.enums.UserType; import org.apache.dolphinscheduler.common.utils.DateUtils; import org.apache.dolphinscheduler.common.utils.StringUtils; @@ -153,6 +154,8 @@ public class DataAnalysisServiceImpl extends BaseService implements DataAnalysis if (processInstanceStateCounts != null) { TaskCountDto taskCountResult = new TaskCountDto(processInstanceStateCounts); + // process state count needs to remove state of forced success + taskCountResult.removeStateFromCountList(ExecutionStatus.FORCED_SUCCESS); result.put(Constants.DATA_LIST, taskCountResult); putMsg(result, Status.SUCCESS); } @@ -243,7 +246,8 @@ public class DataAnalysisServiceImpl extends BaseService implements DataAnalysis // init data map /** * START_PROCESS, START_CURRENT_TASK_PROCESS, RECOVER_TOLERANCE_FAULT_PROCESS, RECOVER_SUSPENDED_PROCESS, - START_FAILURE_TASK_PROCESS,COMPLEMENT_DATA,SCHEDULER, REPEAT_RUNNING,PAUSE,STOP,RECOVER_WAITTING_THREAD; + START_FAILURE_TASK_PROCESS,COMPLEMENT_DATA,SCHEDULER, REPEAT_RUNNING,PAUSE,STOP,RECOVER_WAITTING_THREAD, + RESUME_FROM_FORCED_SUCCESS; */ dataMap.put(CommandType.START_PROCESS, commonCommand); dataMap.put(CommandType.START_CURRENT_TASK_PROCESS, commonCommand); @@ -256,6 +260,7 @@ public class DataAnalysisServiceImpl extends BaseService implements DataAnalysis dataMap.put(CommandType.PAUSE, commonCommand); dataMap.put(CommandType.STOP, commonCommand); dataMap.put(CommandType.RECOVER_WAITTING_THREAD, commonCommand); + dataMap.put(CommandType.RESUME_FROM_FORCED_SUCCESS, commonCommand); // put command state for (CommandCount executeStatusCount : commandStateCounts) { diff --git a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java index 3dfaed3dc8..a9ee584f2b 100644 --- a/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java +++ b/dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/ExecutionStatus.java @@ -55,7 +55,7 @@ public enum ExecutionStatus { KILL(9, "kill"), WAITTING_THREAD(10, "waiting thread"), WAITTING_DEPEND(11, "waiting depend node complete"), - DELAY_EXECUTION(12, "delay execution"), + DELAY_EXECUTION(12, "delay execution"), FORCED_SUCCESS(13, "forced success"); ExecutionStatus(int code, String descp) {