[Fix-17767][Master] fix execute task in workflow instance not effective#18000
Merged
SbloodyS merged 7 commits intoapache:devfrom Mar 30, 2026
Merged
[Fix-17767][Master] fix execute task in workflow instance not effective#18000SbloodyS merged 7 commits intoapache:devfrom
SbloodyS merged 7 commits intoapache:devfrom
Conversation
Mrhs121
requested review from
SbloodyS,
caishunfeng and
ruanwenjun
as code owners
Mrhs121
commented
Feb 25, 2026
| // All out varPool from the successors will be merged into the var pool of the task instance | ||
| private List<Property> generateTaskInstanceVarPool(TaskDefinition taskDefinition, | ||
| // The predecessors of the task instance will be used to generate the var pool. | ||
| // In execute-task(TASK_ONLY) scenario, the predecessor might be outside current execution sub-graph. |
Contributor
Author
There was a problem hiding this comment.
https://github.com/apache/dolphinscheduler/blob/8ee334fc2f4803d7a628458018d82ca695b920d1/dolphinscheduler-master/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteRunnable.java#L1152~L1172
The changes here are based on the old behavior in version 3.2
Mrhs121
changed the title
ruanwenjun
reviewed
Feb 25, 2026
| // The predecessors of the task instance will be used to generate the var pool. | ||
| // In execute-task(TASK_ONLY) scenario, the predecessor might be outside current execution sub-graph. | ||
| // For this case, fallback to workflow varPool to keep compatibility with historical behavior. | ||
| private List<Property> generateTaskInstanceVarPool(WorkflowInstance workflowInstance, |
Member
There was a problem hiding this comment.
It's better to use a clear logic, if the task instance is the start node, then use the workflow instance's varpool as the task instance varpool.
Contributor
Author
There was a problem hiding this comment.
Good idea. I’ve changed it to explicit start-node logic only start node uses workflow instance varPool
![github-advanced-security[bot]](https://avatars.githubusercontent.com/in/57789?s=60&v=4){kind=small}
.../apache/dolphinscheduler/server/master/engine/command/handler/ExecuteTaskCommandHandler.java
Dismissed
Show dismissed
Hide dismissed
.../apache/dolphinscheduler/server/master/engine/command/handler/ExecuteTaskCommandHandler.java
Dismissed
Show dismissed
Hide dismissed
.../apache/dolphinscheduler/server/master/engine/command/handler/ExecuteTaskCommandHandler.java
Dismissed
Show dismissed
Hide dismissed
Mrhs121
force-pushed
the
17767
branch
2 times, most recently
from
3bb87af to
2d7c466
Compare
Contributor
Author
|
@ruanwenjun PTAL, thanks! |
|
This file contains hidden or 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
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
4 participants
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.
Was this PR generated or assisted by AI?
Purpose of the pull request
close #17767
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)
Pull Request Notice
Pull Request Notice
If your pull request contains incompatible change, you should also add it to
docs/docs/en/guide/upgrade/incompatible.md