[Bug] Fix condition task will cause workflow instance failed #16152
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
ruanwenjun
requested review from
caishunfeng,
SbloodyS and
zhuangchong
as code owners
ruanwenjun
force-pushed
the
upstream-dev
branch
2 times, most recently
from
9e39ea4 to
5f22c84
Compare
caishunfeng
reviewed
Jun 14, 2024
Comment on lines
+2016
to
+2021
| /** | ||
| * Whether the task instance need to put into {@link #errorTaskMap}. | ||
| * Only the task instance is failed or killed, and it is parent of condition task. | ||
| * Then it should be put into {@link #errorTaskMap}. | ||
| * <p> Once a task instance is put into {@link #errorTaskMap}, it will be thought as failed and make the workflow be failed. | ||
| */ |
| log.info("The condition result is {}", conditionResult); | ||
| taskParameters.setConditionSuccess(conditionResult == DependResult.SUCCESS); | ||
| taskInstance.setConditionsParameters(taskParameters); | ||
| taskExecutionContext.setCurrentExecutionStatus(TaskExecutionStatus.SUCCESS); |
There was a problem hiding this comment.
Need to update the docs too.
see https://dolphinscheduler.apache.org/zh-cn/docs/3.2.1/guide/task/conditions
There was a problem hiding this comment.
I find the doc is correct, we don't need to update it.
Comment on lines
-309
to
-330
| Map<String, Object> taskParamsMap = new HashMap<>(); | ||
| taskParamsMap.put(Constants.SWITCH_RESULT, ""); | ||
| taskInstance.setTaskParams(JSONUtils.toJsonString(taskParamsMap)); | ||
| taskInstance.setState(TaskExecutionStatus.FAILURE); | ||
| completeTaskList.put(3L, taskInstance); | ||
| postNodes = DagHelper.parsePostNodes(null, skipNodeList, dag, completeTaskList); | ||
| Assertions.assertEquals(1, postNodes.size()); | ||
| Assertions.assertTrue(postNodes.contains(6L)); | ||
| Assertions.assertEquals(2, skipNodeList.size()); | ||
| Assertions.assertTrue(skipNodeList.containsKey(5L)); | ||
| Assertions.assertTrue(skipNodeList.containsKey(7L)); | ||
|
|
||
| // dag: 1-2-3-5-7 4-3-6 | ||
| // 3-if , complete:1/2/3/4 | ||
| // 1.failure:3 expect post:6 skip:5/7 | ||
| dag = generateDag2(); | ||
| skipNodeList.clear(); | ||
| completeTaskList.clear(); | ||
| taskInstance.setSwitchDependency(getSwitchNode()); | ||
| completeTaskList.put(1L, taskInstance); | ||
| postNodes = DagHelper.parsePostNodes(1L, skipNodeList, dag, completeTaskList); | ||
| Assertions.assertEquals(1, postNodes.size()); |
There was a problem hiding this comment.
Maybe should keep the switch UT?
There was a problem hiding this comment.
We have switch UT case, and it's better to split the switch case from condition case. we need to make the case is small enough to maintain.
Codecov ReportAttention: Patch coverage is
Additional details and impacted files@@ Coverage Diff @@
## dev #16152 +/- ##
============================================
- Coverage 41.07% 40.98% -0.09%
+ Complexity 5155 5146 -9
============================================
Files 1399 1399
Lines 44856 44844 -12
Branches 4756 4735 -21
============================================
- Hits 18423 18381 -42
- Misses 24628 24653 +25
- Partials 1805 1810 +5 ☔ View full report in Codecov by Sentry. |
ruanwenjun
changed the title
|
ruanwenjun
added a commit
to ruanwenjun/dolphinscheduler
that referenced
this pull request
Jun 19, 2024
(cherry picked from commit 5df4b1c)
ruanwenjun
added a commit
that referenced
this pull request
Jun 19, 2024
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Purpose of the pull request
close #16150
Brief change log
Verify this pull request
This pull request is code cleanup without any test coverage.
(or)
This pull request is already covered by existing tests, such as (please describe tests).
(or)
This change added tests and can be verified as follows:
(or)
If your pull request contain incompatible change, you should also add it to
docs/docs/en/guide/upgrede/incompatible.md