seg_yinzy
/
DolphinScheduler
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

[Improvement][MasterServer] process complement data optimization #7925 (#7976) 

* [Improvement][MasterServer] process complement data optimization #7925

* [Improvement][MasterServer] process complement data optimization #7925

Co-authored-by: shangeyao <sgy960921>
Update_README
Assert 2022-01-13 10:42:28 +08:00 committed by GitHub
parent 2e530649f8
commit 12d7e6261e
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 29 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

46
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
View File

@ -609,28 +609,40 @@ public class WorkflowExecuteThread {
processInstance.getScheduleTime(), processInstance.getScheduleTime(),
complementListDate.toString()); complementListDate.toString());
scheduleDate = complementListDate.get(index + 1); scheduleDate = complementListDate.get(index + 1);
//the next process complement
processInstance.setId(0);
} }
processInstance.setScheduleTime(scheduleDate); //the next process complement
int create = this.createComplementDataCommand(scheduleDate);
if (create > 0) {
logger.info("create complement data command successfully.");
}
return true;
}
private int createComplementDataCommand(Date scheduleDate) {
Command command = new Command();
command.setScheduleTime(scheduleDate);
command.setCommandType(CommandType.COMPLEMENT_DATA);
command.setProcessDefinitionCode(processInstance.getProcessDefinitionCode());
Map<String, String> cmdParam = JSONUtils.toMap(processInstance.getCommandParam()); Map<String, String> cmdParam = JSONUtils.toMap(processInstance.getCommandParam());
if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING)) { if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING)) {
cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING); cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING);
processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
} }
cmdParam.replace(CMDPARAM_COMPLEMENT_DATA_START_DATE, DateUtils.format(scheduleDate, "yyyy-MM-dd HH:mm:ss"));
processInstance.setState(ExecutionStatus.RUNNING_EXECUTION); command.setCommandParam(JSONUtils.toJsonString(cmdParam));
processInstance.setGlobalParams(ParameterUtils.curingGlobalParams( command.setTaskDependType(processInstance.getTaskDependType());
processDefinition.getGlobalParamMap(), command.setFailureStrategy(processInstance.getFailureStrategy());
processDefinition.getGlobalParamList(), command.setWarningType(processInstance.getWarningType());
CommandType.COMPLEMENT_DATA, processInstance.getScheduleTime())); command.setWarningGroupId(processInstance.getWarningGroupId());
processInstance.setStartTime(new Date()); command.setStartTime(new Date());
processInstance.setRestartTime(processInstance.getStartTime()); command.setExecutorId(processInstance.getExecutorId());
processInstance.setEndTime(null); command.setUpdateTime(new Date());
processService.saveProcessInstance(processInstance); command.setProcessInstancePriority(processInstance.getProcessInstancePriority());
this.taskInstanceMap.clear(); command.setWorkerGroup(processInstance.getWorkerGroup());
startProcess(); command.setEnvironmentCode(processInstance.getEnvironmentCode());
return true; command.setDryRun(processInstance.getDryRun());
command.setProcessInstanceId(0);
command.setProcessDefinitionVersion(processInstance.getProcessDefinitionVersion());
return processService.createCommand(command);
} }
private boolean needComplementProcess() { private boolean needComplementProcess() {