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/06/20 04:35:02 UTC
[GitHub] [dolphinscheduler] caishunfeng commented on a diff in pull request #10453: [Fix-10452] Serial wait for policy recovery
caishunfeng commented on code in PR #10453:
URL: https://github.com/apache/dolphinscheduler/pull/10453#discussion_r901245147
##########
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java:
##########
@@ -852,6 +851,10 @@ public void checkSerialProcess(ProcessDefinition processDefinition) {
if (nextProcessInstance == null) {
return;
}
+ ProcessInstance nextReadyStopProcessInstance = this.processService.loadNextProcess4Serial(processInstance.getProcessDefinition().getCode(), ExecutionStatus.READY_STOP.getCode(), processInstance.getId());
Review Comment:
Is the state `READY_STOP` right?
##########
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java:
##########
@@ -345,25 +345,31 @@ protected void saveSerialProcess(ProcessInstance processInstance, ProcessDefinit
} else if (processDefinition.getExecutionType().typeIsSerialPriority()) {
List<ProcessInstance> runningProcessInstances = this.processInstanceMapper.queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId(processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion(), Constants.RUNNING_PROCESS_STATE, processInstance.getId());
- if (CollectionUtils.isNotEmpty(runningProcessInstances)) {
- for (ProcessInstance info : runningProcessInstances) {
- info.setCommandType(CommandType.STOP);
- info.addHistoryCmd(CommandType.STOP);
- info.setState(ExecutionStatus.READY_STOP);
- int update = updateProcessInstance(info);
- // determine whether the process is normal
- if (update > 0) {
- String host = info.getHost();
- String address = host.split(":")[0];
- int port = Integer.parseInt(host.split(":")[1]);
- StateEventChangeCommand stateEventChangeCommand = new StateEventChangeCommand(
+ if (CollectionUtils.isEmpty(runningProcessInstances)) {
+ processInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS);
+ saveProcessInstance(processInstance);
+ return;
+ }
+ for (ProcessInstance info : runningProcessInstances) {
+ if (Objects.nonNull(info.getState()) && (ExecutionStatus.READY_STOP.equals(info.getState()) || info.getState().typeIsFinished())) {
+ continue;
+ }
+ info.setCommandType(CommandType.STOP);
+ info.addHistoryCmd(CommandType.STOP);
+ info.setState(ExecutionStatus.READY_STOP);
+ int update = updateProcessInstance(info);
+ // determine whether the process is normal
+ if (update > 0) {
+ String host = info.getHost();
+ String address = host.split(":")[0];
+ int port = Integer.parseInt(host.split(":")[1]);
+ StateEventChangeCommand stateEventChangeCommand = new StateEventChangeCommand(
info.getId(), 0, info.getState(), info.getId(), 0
- );
- try {
- stateEventCallbackService.sendResult(address, port, stateEventChangeCommand.convert2Command());
- } catch (Exception e) {
- logger.error("sendResultError");
- }
+ );
+ try {
+ stateEventCallbackService.sendResult(address, port, stateEventChangeCommand.convert2Command());
+ } catch (Exception e) {
+ logger.error("sendResultError");
Review Comment:
```suggestion
logger.error("sendResultError", e);
```
##########
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java:
##########
@@ -345,25 +345,31 @@ protected void saveSerialProcess(ProcessInstance processInstance, ProcessDefinit
} else if (processDefinition.getExecutionType().typeIsSerialPriority()) {
List<ProcessInstance> runningProcessInstances = this.processInstanceMapper.queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId(processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion(), Constants.RUNNING_PROCESS_STATE, processInstance.getId());
- if (CollectionUtils.isNotEmpty(runningProcessInstances)) {
- for (ProcessInstance info : runningProcessInstances) {
- info.setCommandType(CommandType.STOP);
- info.addHistoryCmd(CommandType.STOP);
- info.setState(ExecutionStatus.READY_STOP);
- int update = updateProcessInstance(info);
- // determine whether the process is normal
- if (update > 0) {
- String host = info.getHost();
- String address = host.split(":")[0];
- int port = Integer.parseInt(host.split(":")[1]);
- StateEventChangeCommand stateEventChangeCommand = new StateEventChangeCommand(
+ if (CollectionUtils.isEmpty(runningProcessInstances)) {
+ processInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS);
+ saveProcessInstance(processInstance);
+ return;
+ }
+ for (ProcessInstance info : runningProcessInstances) {
+ if (Objects.nonNull(info.getState()) && (ExecutionStatus.READY_STOP.equals(info.getState()) || info.getState().typeIsFinished())) {
+ continue;
+ }
+ info.setCommandType(CommandType.STOP);
+ info.addHistoryCmd(CommandType.STOP);
+ info.setState(ExecutionStatus.READY_STOP);
+ int update = updateProcessInstance(info);
+ // determine whether the process is normal
+ if (update > 0) {
+ String host = info.getHost();
+ String address = host.split(":")[0];
+ int port = Integer.parseInt(host.split(":")[1]);
+ StateEventChangeCommand stateEventChangeCommand = new StateEventChangeCommand(
info.getId(), 0, info.getState(), info.getId(), 0
- );
- try {
- stateEventCallbackService.sendResult(address, port, stateEventChangeCommand.convert2Command());
- } catch (Exception e) {
- logger.error("sendResultError");
- }
+ );
+ try {
+ stateEventCallbackService.sendResult(address, port, stateEventChangeCommand.convert2Command());
Review Comment:
I think we should add a new `sendResult(Host host, Command command)`, WDYT?
##########
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java:
##########
@@ -345,25 +345,31 @@ protected void saveSerialProcess(ProcessInstance processInstance, ProcessDefinit
} else if (processDefinition.getExecutionType().typeIsSerialPriority()) {
List<ProcessInstance> runningProcessInstances = this.processInstanceMapper.queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId(processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion(), Constants.RUNNING_PROCESS_STATE, processInstance.getId());
- if (CollectionUtils.isNotEmpty(runningProcessInstances)) {
- for (ProcessInstance info : runningProcessInstances) {
- info.setCommandType(CommandType.STOP);
- info.addHistoryCmd(CommandType.STOP);
- info.setState(ExecutionStatus.READY_STOP);
- int update = updateProcessInstance(info);
- // determine whether the process is normal
- if (update > 0) {
- String host = info.getHost();
- String address = host.split(":")[0];
- int port = Integer.parseInt(host.split(":")[1]);
- StateEventChangeCommand stateEventChangeCommand = new StateEventChangeCommand(
+ if (CollectionUtils.isEmpty(runningProcessInstances)) {
+ processInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS);
+ saveProcessInstance(processInstance);
+ return;
+ }
+ for (ProcessInstance info : runningProcessInstances) {
+ if (Objects.nonNull(info.getState()) && (ExecutionStatus.READY_STOP.equals(info.getState()) || info.getState().typeIsFinished())) {
+ continue;
+ }
+ info.setCommandType(CommandType.STOP);
+ info.addHistoryCmd(CommandType.STOP);
+ info.setState(ExecutionStatus.READY_STOP);
+ int update = updateProcessInstance(info);
+ // determine whether the process is normal
+ if (update > 0) {
+ String host = info.getHost();
+ String address = host.split(":")[0];
+ int port = Integer.parseInt(host.split(":")[1]);
Review Comment:
same here.
##########
dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessServiceImpl.java:
##########
@@ -345,25 +345,31 @@ protected void saveSerialProcess(ProcessInstance processInstance, ProcessDefinit
} else if (processDefinition.getExecutionType().typeIsSerialPriority()) {
List<ProcessInstance> runningProcessInstances = this.processInstanceMapper.queryByProcessDefineCodeAndProcessDefinitionVersionAndStatusAndNextId(processInstance.getProcessDefinitionCode(),
processInstance.getProcessDefinitionVersion(), Constants.RUNNING_PROCESS_STATE, processInstance.getId());
- if (CollectionUtils.isNotEmpty(runningProcessInstances)) {
- for (ProcessInstance info : runningProcessInstances) {
- info.setCommandType(CommandType.STOP);
- info.addHistoryCmd(CommandType.STOP);
- info.setState(ExecutionStatus.READY_STOP);
- int update = updateProcessInstance(info);
- // determine whether the process is normal
- if (update > 0) {
- String host = info.getHost();
- String address = host.split(":")[0];
- int port = Integer.parseInt(host.split(":")[1]);
- StateEventChangeCommand stateEventChangeCommand = new StateEventChangeCommand(
+ if (CollectionUtils.isEmpty(runningProcessInstances)) {
+ processInstance.setState(ExecutionStatus.SUBMITTED_SUCCESS);
+ saveProcessInstance(processInstance);
+ return;
+ }
+ for (ProcessInstance info : runningProcessInstances) {
+ if (Objects.nonNull(info.getState()) && (ExecutionStatus.READY_STOP.equals(info.getState()) || info.getState().typeIsFinished())) {
+ continue;
+ }
+ info.setCommandType(CommandType.STOP);
+ info.addHistoryCmd(CommandType.STOP);
+ info.setState(ExecutionStatus.READY_STOP);
+ int update = updateProcessInstance(info);
+ // determine whether the process is normal
+ if (update > 0) {
+ String host = info.getHost();
+ String address = host.split(":")[0];
Review Comment:
use Constant.
--
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