Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

[Fix-10762] [bug] Dependent tasks wait for the workflow to end #10765

Merged
merged 10 commits into from
Jul 4, 2022
Merged

[Fix-10762] [bug] Dependent tasks wait for the workflow to end #10765

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
10 commits
Select commit Hold shift + click to select a range
2bb569c
issue 8645 (#8811)
zhanqian-1993 Mar 10, 2022
12b9d58
[fix-8929][DAO]Description Failed to upload the file because the full…
Hou-Shuaishuai Mar 25, 2022
b84815c
[BUG][ALERT-SERVER]validate script before alert script (#9834)
Tianqi-Dotes Apr 28, 2022
29066ab
pick 8811/9020/9834
Jul 3, 2022
c2aaca0
fix ut
Jul 3, 2022
15bfc97
Merge remote-tracking branch 'upstream/2.0.6-prepare' into 206-pick
Jul 4, 2022
0601eca
fix pick error
Jul 4, 2022
aa5a535
Merge remote-tracking branch 'upstream/2.0.6-prepare' into 206-pick
Jul 4, 2022
d46d5b8
Merge remote-tracking branch 'upstream/2.0.6-prepare' into 206-pick
Jul 4, 2022
b27f2d3
fix 10762
Jul 4, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 1 addition & 0 deletions ...-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ResourcesServiceImpl.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -64,6 +64,7 @@
import java.util.HashSet;
import java.util.List;
import java.util.Map;
import java.util.Objects;
import java.util.Set;
import java.util.UUID;
import java.util.regex.Matcher;
Expand Down
19 changes: 12 additions & 7 deletions ...duler-server/src/main/java/org/apache/dolphinscheduler/server/utils/DependentExecute.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -115,16 +115,16 @@ private DependResult calculateResultForTasks(DependentItem dependentItem, List<D
dependentItem.getDefinitionCode(), dependentItem.getDepTaskCode());
return DependResult.WAITING;
}
if (!processInstance.getState().typeIsFinished()) {
logger.info("Wait for the dependent workflow to complete, processDefiniteCode:{}, taskCode:{}, processInstanceId:{}, processInstance state:{}",
dependentItem.getDefinitionCode(), dependentItem.getDepTaskCode(), processInstance.getId(), processInstance.getState());
return DependResult.WAITING;
}
// need to check workflow for updates, so get all task and check the task state
if (dependentItem.getDepTaskCode() == Constants.DEPENDENT_ALL_TASK_CODE) {
if (!processInstance.getState().typeIsFinished()) {
logger.info("Wait for the dependent workflow to complete, processDefiniteCode:{}, taskCode:{}, processInstanceId:{}, processInstance state:{}",
dependentItem.getDefinitionCode(), dependentItem.getDepTaskCode(), processInstance.getId(), processInstance.getState());
return DependResult.WAITING;
}
result = dependResultByProcessInstance(processInstance, dateInterval);
} else {
result = getDependTaskResult(dependentItem.getDepTaskCode(), dateInterval);
result = getDependTaskResult(processInstance, dependentItem.getDepTaskCode(), dateInterval);
}
if (result != DependResult.SUCCESS) {
break;
Expand Down Expand Up @@ -192,10 +192,15 @@ private DependResult dependResultByProcessInstance(ProcessInstance processInstan
/**
* get depend task result
*/
private DependResult getDependTaskResult(long taskCode, DateInterval dateInterval) {
private DependResult getDependTaskResult(ProcessInstance processInstance, long taskCode, DateInterval dateInterval) {
TaskInstance taskInstance = processService.findLastTaskInstanceInterval(taskCode, dateInterval);
DependResult result;
if (taskInstance == null) {
if (!processInstance.getState().typeIsFinished()) {
logger.info("Wait for the dependent workflow to complete, taskCode:{}, processInstanceId:{}, processInstance state:{}",
taskCode, processInstance.getId(), processInstance.getState());
return DependResult.WAITING;
}
TaskDefinition taskDefinition = processService.findTaskDefinitionByCode(taskCode);
if (taskDefinition == null) {
logger.error("Cannot find the task definition, something error, taskCode: {}", taskCode);
Expand Down