Skip to content

[Fix-Typo] Fix typo in dev branch. #8395

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

Merged
caishunfeng merged 15 commits into from
Feb 16, 2022
Merged

[Fix-Typo] Fix typo in dev branch. #8395

Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
e6cc683
fix bug_8337
SbloodyS Feb 11, 2022
7b0c76f
fix bug_8337
SbloodyS Feb 11, 2022
285f68d
fix bug_8337
SbloodyS Feb 11, 2022
6157fee
fix bug_8337
SbloodyS Feb 11, 2022
68d93cb
fix bug_8337
SbloodyS Feb 11, 2022
614dc48
fix bug_8337
SbloodyS Feb 11, 2022
b899ce1
fix bug_8337
SbloodyS Feb 11, 2022
ccc5bce
Merge branch 'apache:dev' into dev_bug_8337
SbloodyS Feb 14, 2022
1590d45
test
SbloodyS Feb 14, 2022
6cd046d
fix dev_bug_8337
SbloodyS Feb 15, 2022
0ed2f27
fix dev_bug_8337
SbloodyS Feb 15, 2022
350ed03
fix dev_bug_8337
SbloodyS Feb 15, 2022
7eb02e5
fix bug_8337
SbloodyS Feb 15, 2022
4560767
fix typo
SbloodyS Feb 16, 2022
85a878c
fix typo
SbloodyS Feb 16, 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
4 changes: 2 additions & 2 deletions ...src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -1463,10 +1463,10 @@ private ExecutionStatus getProcessInstanceState(ProcessInstance instance) {
if (state == ExecutionStatus.READY_STOP) {
List<TaskInstance> stopList = getCompleteTaskByState(ExecutionStatus.STOP);
List<TaskInstance> killList = getCompleteTaskByState(ExecutionStatus.KILL);
List<TaskInstance> faillist = getCompleteTaskByState(ExecutionStatus.FAILURE);
List<TaskInstance> failList = getCompleteTaskByState(ExecutionStatus.FAILURE);
if (CollectionUtils.isNotEmpty(stopList)
|| CollectionUtils.isNotEmpty(killList)
|| CollectionUtils.isNotEmpty(faillist)
|| CollectionUtils.isNotEmpty(failList)
|| !isComplementEnd()) {
return ExecutionStatus.STOP;
} else {
Expand Down