caishunfeng commented on a change in pull request #6272:
URL: https://github.com/apache/dolphinscheduler/pull/6272#discussion_r801588485
##########
File path:
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
##########
@@ -652,6 +661,23 @@ private boolean processStateChangeHandler(StateEvent
stateEvent) {
return true;
}
+ private boolean processBlockHandler(StateEvent stateEvent) {
+ try {
+ TaskInstance task =
processService.findTaskInstanceById(stateEvent.getTaskInstanceId());
Review comment:
```suggestion
TaskInstance task =
getTaskInstance(stateEvent.getTaskInstanceId());
```
##########
File path:
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
##########
@@ -440,14 +446,17 @@ private void taskFinished(TaskInstance taskInstance) {
completeTaskMap.put(taskInstance.getTaskCode(),
taskInstance.getId());
processInstance.setVarPool(taskInstance.getVarPool());
processService.saveProcessInstance(processInstance);
- submitPostNode(Long.toString(taskInstance.getTaskCode()));
+ if (!processInstance.isBlocked()) {
Review comment:
It seems block in taskInstance but not processInstance.
##########
File path:
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
##########
@@ -652,6 +661,23 @@ private boolean processStateChangeHandler(StateEvent
stateEvent) {
return true;
}
+ private boolean processBlockHandler(StateEvent stateEvent) {
Review comment:
It seems better to check task type before handle. If not block task,
return directly.
##########
File path:
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
##########
@@ -652,6 +661,23 @@ private boolean processStateChangeHandler(StateEvent
stateEvent) {
return true;
}
+ private boolean processBlockHandler(StateEvent stateEvent) {
+ try {
+ TaskInstance task =
processService.findTaskInstanceById(stateEvent.getTaskInstanceId());
+ BlockingParameters parameters = (BlockingParameters)
TaskParametersUtils.getParameters(TaskType.BLOCKING.getDesc(),
+ task.getTaskParams());
+ if (parameters.isAlertWhenBlocking()) {
+ ProjectUser projectUser =
processService.queryProjectWithUserByProcessInstanceId(processInstance.getId());
+ processAlertManager.sendProcessBlockingAlert(processInstance,
projectUser);
+ logger.info("block alert send successful!");
Review comment:
```suggestion
logger.info("processInstance {} block alert send
successful!", processInstance.id);
```
##########
File path:
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
##########
@@ -652,6 +661,23 @@ private boolean processStateChangeHandler(StateEvent
stateEvent) {
return true;
}
+ private boolean processBlockHandler(StateEvent stateEvent) {
+ try {
+ TaskInstance task =
processService.findTaskInstanceById(stateEvent.getTaskInstanceId());
+ BlockingParameters parameters = (BlockingParameters)
TaskParametersUtils.getParameters(TaskType.BLOCKING.getDesc(),
+ task.getTaskParams());
+ if (parameters.isAlertWhenBlocking()) {
+ ProjectUser projectUser =
processService.queryProjectWithUserByProcessInstanceId(processInstance.getId());
+ processAlertManager.sendProcessBlockingAlert(processInstance,
projectUser);
+ logger.info("block alert send successful!");
+ }
+ taskStateChangeHandler(stateEvent);
Review comment:
It's better to handle task block directly, but not call
`taskStateChangeHandler`, because it's the different event type.
##########
File path:
dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/BlockingTaskProcessor.java
##########
@@ -0,0 +1,192 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements. See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License. You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+package org.apache.dolphinscheduler.server.master.runner.task;
+
+import com.google.auto.service.AutoService;
+import org.apache.dolphinscheduler.common.Constants;
+import org.apache.dolphinscheduler.common.enums.*;
+import org.apache.dolphinscheduler.common.model.DependentItem;
+import org.apache.dolphinscheduler.common.model.DependentTaskModel;
+import org.apache.dolphinscheduler.common.task.blocking.BlockingParameters;
+import org.apache.dolphinscheduler.common.task.dependent.DependentParameters;
+import org.apache.dolphinscheduler.common.utils.DependentUtils;
+import org.apache.dolphinscheduler.common.utils.NetUtils;
+import org.apache.dolphinscheduler.common.utils.TaskParametersUtils;
+import org.apache.dolphinscheduler.dao.entity.TaskInstance;
+import org.apache.dolphinscheduler.server.utils.LogUtils;
+
+import java.util.ArrayList;
+import java.util.Date;
+import java.util.List;
+import java.util.Map;
+import java.util.concurrent.ConcurrentHashMap;
+
+/**
+ * blocking task processor
+ */
+@AutoService(ITaskProcessor.class)
+public class BlockingTaskProcessor extends BaseTaskProcessor{
+
+ /**
+ * dependent parameters
+ */
+ private DependentParameters dependentParameters;
+
+ /**
+ * condition result
+ */
+ private DependResult conditionResult = DependResult.WAITING;
+
+ /**
+ * blocking parameters
+ */
+ private BlockingParameters blockingParam;
+
+ /**
+ * complete task map
+ */
+ private Map<Long, ExecutionStatus> completeTaskList = new
ConcurrentHashMap<>();
+
+ private void initTaskParameters() {
+
taskInstance.setLogPath(LogUtils.getTaskLogPath(taskInstance.getFirstSubmitTime(),
processInstance.getProcessDefinitionCode(),
+ processInstance.getProcessDefinitionVersion(),
+ taskInstance.getProcessInstanceId(),
+ taskInstance.getId()));
+
this.taskInstance.setHost(NetUtils.getAddr(masterConfig.getListenPort()));
+ this.taskInstance.setState(ExecutionStatus.RUNNING_EXECUTION);
+ this.taskInstance.setStartTime(new Date());
+ this.processService.saveTaskInstance(taskInstance);
+ this.dependentParameters = taskInstance.getDependency();
+ this.blockingParam = (BlockingParameters)
TaskParametersUtils.getParameters(
+ TaskType.BLOCKING.getDesc(), taskInstance.getTaskParams());
+ }
+
+ @Override
+ protected boolean pauseTask() {
+ taskInstance.setState(ExecutionStatus.PAUSE);
+ taskInstance.setEndTime(new Date());
+ processService.saveTaskInstance(taskInstance);
+ logger.info("blocking task has been paused");
+ return true;
+ }
+
+ @Override
+ protected boolean killTask() {
+ taskInstance.setState(ExecutionStatus.KILL);
+ taskInstance.setEndTime(new Date());
+ processService.saveTaskInstance(taskInstance);
+ logger.info("blocking task has been killed");
+ return true;
+ }
+
+ @Override
+ protected boolean taskTimeout() {
+ return true;
+ }
+
+ @Override
+ protected boolean submitTask() {
+ this.taskInstance =
processService.submitTaskWithRetry(processInstance, taskInstance,
maxRetryTimes, commitInterval);
+ if (this.taskInstance == null) {
+ return false;
+ }
+ this.setTaskExecutionLogger();
+ initTaskParameters();
+ logger.info("blocking task start");
+ return true;
+ }
+
+ @Override
+ protected boolean runTask() {
+ if (conditionResult.equals(DependResult.WAITING)) {
+ setConditionResult();
+ endTask();
+ } else {
+ endTask();
+ }
+ return true;
+ }
+
+ @Override
+ protected boolean dispatchTask() {
+ return false;
+ }
+
+ @Override
+ public String getType() {
+ return TaskType.BLOCKING.getDesc();
+ }
+
+ /**
+ * depend result for depend item
+ */
+ private DependResult getDependResultForItem(DependentItem item) {
+
+ DependResult dependResult = DependResult.SUCCESS;
+ if (!completeTaskList.containsKey(item.getDepTaskCode())) {
+ logger.info("depend item: {} have not completed yet.",
item.getDepTaskCode());
+ dependResult = DependResult.FAILED;
+ return dependResult;
+ }
+ ExecutionStatus executionStatus =
completeTaskList.get(item.getDepTaskCode());
+ if (executionStatus != item.getStatus()) {
+ logger.info("depend item : {} expect status: {}, actual status:
{}", item.getDepTaskCode(), item.getStatus(), executionStatus);
+ dependResult = DependResult.FAILED;
+ }
+ logger.info("dependent item complete {} {},{}",
+ Constants.DEPENDENT_SPLIT, item.getDepTaskCode(),
dependResult);
+ return dependResult;
+ }
+
+ private void setConditionResult() {
+
+ List<TaskInstance> taskInstances =
processService.findValidTaskListByProcessId(taskInstance.getProcessInstanceId());
+ for (TaskInstance task : taskInstances) {
+ completeTaskList.putIfAbsent(task.getTaskCode(), task.getState());
+ }
+
+ List<DependResult> tempResultList = new ArrayList<>();
+ for (DependentTaskModel dependentTaskModel :
dependentParameters.getDependTaskList()) {
+ List<DependResult> itemDependResult = new ArrayList<>();
+ for (DependentItem item : dependentTaskModel.getDependItemList()) {
+ itemDependResult.add(getDependResultForItem(item));
+ }
+ DependResult tempResult =
DependentUtils.getDependResultForRelation(dependentTaskModel.getRelation(),
itemDependResult);
+ tempResultList.add(tempResult);
+ }
+ conditionResult =
DependentUtils.getDependResultForRelation(dependentParameters.getRelation(),
tempResultList);
+ logger.info("the blocking task depend result : {}", conditionResult);
+ }
+
+ private void endTask() {
+ ExecutionStatus status = ExecutionStatus.SUCCESS;
+ DependResult expected = this.blockingParam.getBlockingOpportunity()
+ .equals(BlockingOpportunity.BLOCKING_ON_SUCCESS.getDesc()) ?
+ DependResult.SUCCESS : DependResult.FAILED;
+ boolean isBlocked = (expected == this.conditionResult);
+ logger.info("blocking opportunity: expected-->{}, actual-->{}",
expected, this.conditionResult);
+ processInstance.setBlocked(isBlocked);
+ if (isBlocked) {
+ processInstance.setState(ExecutionStatus.READY_PAUSE);
Review comment:
Why not add a new state of `BLOCK`?
--
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: [email protected]
For queries about this service, please contact Infrastructure at:
[email protected]
