You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@dolphinscheduler.apache.org by GitBox <gi...@apache.org> on 2022/01/13 01:50:23 UTC
[GitHub] [dolphinscheduler] caishunfeng commented on a change in pull request #7976: [Improvement][MasterServer] process complement data optimization #7925
caishunfeng commented on a change in pull request #7976:
URL: https://github.com/apache/dolphinscheduler/pull/7976#discussion_r783566459
##########
File path: dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
##########
@@ -609,27 +609,33 @@ private boolean processComplementData() throws Exception {
processInstance.getScheduleTime(),
complementListDate.toString());
scheduleDate = complementListDate.get(index + 1);
- //the next process complement
- processInstance.setId(0);
}
- processInstance.setScheduleTime(scheduleDate);
+ //the next process complement
+ Command command = new Command();
+ command.setScheduleTime(scheduleDate);
+ command.setCommandType(CommandType.COMPLEMENT_DATA);
+ command.setProcessDefinitionCode(processInstance.getProcessDefinitionCode());
Map<String, String> cmdParam = JSONUtils.toMap(processInstance.getCommandParam());
if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING)) {
cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING);
- processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
- }
-
- processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
- processInstance.setGlobalParams(ParameterUtils.curingGlobalParams(
- processDefinition.getGlobalParamMap(),
- processDefinition.getGlobalParamList(),
- CommandType.COMPLEMENT_DATA, processInstance.getScheduleTime()));
- processInstance.setStartTime(new Date());
- processInstance.setRestartTime(processInstance.getStartTime());
- processInstance.setEndTime(null);
- processService.saveProcessInstance(processInstance);
+ }
+ cmdParam.replace(CMDPARAM_COMPLEMENT_DATA_START_DATE, DateUtils.format(scheduleDate, "yyyy-MM-dd HH:mm:ss"));
+ command.setCommandParam(JSONUtils.toJsonString(cmdParam));
+ command.setTaskDependType(TaskDependType.TASK_POST);
+ command.setFailureStrategy(processInstance.getFailureStrategy());
+ command.setWarningType(processInstance.getWarningType());
+ command.setWarningGroupId(processInstance.getWarningGroupId());
+ command.setStartTime(new Date());
+ command.setExecutorId(processInstance.getExecutorId());
+ command.setUpdateTime(new Date());
+ command.setProcessInstancePriority(processInstance.getProcessInstancePriority());
+ command.setWorkerGroup(processInstance.getWorkerGroup());
+ command.setEnvironmentCode(processInstance.getEnvironmentCode());
+ command.setDryRun(processInstance.getDryRun());
+ command.setProcessInstanceId(0);
+ command.setProcessDefinitionVersion(processInstance.getProcessDefinitionVersion());
+ processService.createCommand(command);
this.taskInstanceMap.clear();
Review comment:
should be removed too.
##########
File path: dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
##########
@@ -609,27 +609,33 @@ private boolean processComplementData() throws Exception {
processInstance.getScheduleTime(),
complementListDate.toString());
scheduleDate = complementListDate.get(index + 1);
- //the next process complement
- processInstance.setId(0);
}
- processInstance.setScheduleTime(scheduleDate);
+ //the next process complement
+ Command command = new Command();
+ command.setScheduleTime(scheduleDate);
+ command.setCommandType(CommandType.COMPLEMENT_DATA);
+ command.setProcessDefinitionCode(processInstance.getProcessDefinitionCode());
Map<String, String> cmdParam = JSONUtils.toMap(processInstance.getCommandParam());
if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING)) {
cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING);
- processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
- }
-
- processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
- processInstance.setGlobalParams(ParameterUtils.curingGlobalParams(
- processDefinition.getGlobalParamMap(),
- processDefinition.getGlobalParamList(),
- CommandType.COMPLEMENT_DATA, processInstance.getScheduleTime()));
- processInstance.setStartTime(new Date());
- processInstance.setRestartTime(processInstance.getStartTime());
- processInstance.setEndTime(null);
- processService.saveProcessInstance(processInstance);
+ }
+ cmdParam.replace(CMDPARAM_COMPLEMENT_DATA_START_DATE, DateUtils.format(scheduleDate, "yyyy-MM-dd HH:mm:ss"));
+ command.setCommandParam(JSONUtils.toJsonString(cmdParam));
+ command.setTaskDependType(TaskDependType.TASK_POST);
Review comment:
Is `TaskDependType.TASK_POST` correct?
##########
File path: dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
##########
@@ -609,27 +609,33 @@ private boolean processComplementData() throws Exception {
processInstance.getScheduleTime(),
complementListDate.toString());
scheduleDate = complementListDate.get(index + 1);
- //the next process complement
- processInstance.setId(0);
}
- processInstance.setScheduleTime(scheduleDate);
+ //the next process complement
+ Command command = new Command();
+ command.setScheduleTime(scheduleDate);
+ command.setCommandType(CommandType.COMPLEMENT_DATA);
+ command.setProcessDefinitionCode(processInstance.getProcessDefinitionCode());
Map<String, String> cmdParam = JSONUtils.toMap(processInstance.getCommandParam());
if (cmdParam.containsKey(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING)) {
cmdParam.remove(Constants.CMD_PARAM_RECOVERY_START_NODE_STRING);
- processInstance.setCommandParam(JSONUtils.toJsonString(cmdParam));
- }
-
- processInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
- processInstance.setGlobalParams(ParameterUtils.curingGlobalParams(
- processDefinition.getGlobalParamMap(),
- processDefinition.getGlobalParamList(),
- CommandType.COMPLEMENT_DATA, processInstance.getScheduleTime()));
- processInstance.setStartTime(new Date());
- processInstance.setRestartTime(processInstance.getStartTime());
- processInstance.setEndTime(null);
- processService.saveProcessInstance(processInstance);
+ }
+ cmdParam.replace(CMDPARAM_COMPLEMENT_DATA_START_DATE, DateUtils.format(scheduleDate, "yyyy-MM-dd HH:mm:ss"));
Review comment:
Should `CMDPARAM_COMPLEMENT_DATA_END_DATE` also be set?
--
This is an automated message from the Apache Git Service.
To respond to the message, please log on to GitHub and use the
URL above to go to the specific comment.
To unsubscribe, e-mail: commits-unsubscribe@dolphinscheduler.apache.org
For queries about this service, please contact Infrastructure at:
users@infra.apache.org