test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-12-04 05:09:48 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity

修改与新增commandType相关的代码

Browse Source 
1. dataAnalysis
2. alertManager
3. businessTimeUtils的schedule选择
This commit is contained in:
Zhou Zheng 2020-08-07 15:39:48 +08:00
parent 48afb2e2f8
commit 90a060128f
3 changed files with 6 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/DataAnalysisService.java
View File

@ -243,7 +243,8 @@ public class DataAnalysisService extends BaseService{
// init data map // init data map
/** /**
* START_PROCESS, START_CURRENT_TASK_PROCESS, RECOVER_TOLERANCE_FAULT_PROCESS, RECOVER_SUSPENDED_PROCESS, * 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_PROCESS,commonCommand);
dataMap.put(CommandType.START_CURRENT_TASK_PROCESS,commonCommand); dataMap.put(CommandType.START_CURRENT_TASK_PROCESS,commonCommand);
@ -256,6 +257,7 @@ public class DataAnalysisService extends BaseService{
dataMap.put(CommandType.PAUSE,commonCommand); dataMap.put(CommandType.PAUSE,commonCommand);
dataMap.put(CommandType.STOP,commonCommand); dataMap.put(CommandType.STOP,commonCommand);
dataMap.put(CommandType.RECOVER_WAITTING_THREAD,commonCommand); dataMap.put(CommandType.RECOVER_WAITTING_THREAD,commonCommand);
dataMap.put(CommandType.RESUME_FROM_FORCED_SUCCESS, commonCommand);
// put command state // put command state
for (CommandCount executeStatusCount : commandStateCounts){ for (CommandCount executeStatusCount : commandStateCounts){

1
dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/placeholder/BusinessTimeUtils.java
View File

@ -54,6 +54,7 @@ public class BusinessTimeUtils {
case RECOVER_SUSPENDED_PROCESS: case RECOVER_SUSPENDED_PROCESS:
case START_FAILURE_TASK_PROCESS: case START_FAILURE_TASK_PROCESS:
case REPEAT_RUNNING: case REPEAT_RUNNING:
case RESUME_FROM_FORCED_SUCCESS:
case SCHEDULER: case SCHEDULER:
default: default:
businessDate = addDays(new Date(), -1); businessDate = addDays(new Date(), -1);

2
dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/AlertManager.java
View File

@ -81,6 +81,8 @@ public class AlertManager {
return "pause"; return "pause";
case STOP: case STOP:
return "stop"; return "stop";
case RESUME_FROM_FORCED_SUCCESS:
return "resume from forced success";
default: default:
return "unknown type"; return "unknown type";
} }