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.

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

[Fix-15036] [API] Fix task definition edit doesn't work #14801

Merged
merged 17 commits into from
Oct 25, 2023
Merged

[Fix-15036] [API] Fix task definition edit doesn't work #14801

merged 17 commits into from
Oct 25, 2023

Conversation

sdhzwc
Copy link
Contributor

@sdhzwc sdhzwc commented Aug 24, 2023

fix #15036

Problem description: All versions have the problem that task definition changes do not take effect in the workflow and vice versa. There are several points as follows:

  1. Modify the task definition without a predecessor task, but it is not available in the workflow.
    2、Modify the task definition with a predecessor task, but it is not available in the workflow.
    3、Switch the workflow version and modify the task definition, which is not available in the workflow.

Dynamic demonstration of before and after repair comparison:
Before Repair
修改前

二、After Repair
修复后

@EricGao888
Copy link
Member

@sdhzwc Could u plz use English for PR descriptions?

@EricGao888 EricGao888 added the first time contributor First-time contributor label Aug 24, 2023
@sdhzwc
Copy link
Contributor Author

sdhzwc commented Aug 24, 2023

@sdhzwc Could u plz use English for PR descriptions?

Sorry, my English is not very good

@ruanwenjun ruanwenjun changed the title [Bug] [task definition] 修复任务定义修改,工作流无法生效问题 [Bug] [API] Fix task definition edit doesn't work Aug 24, 2023
@ruanwenjun
Copy link
Member

@sdhzwc Could u plz use English for PR descriptions?

Sorry, my English is not very good Chinese is my native language, so describing it more smoothly

Thanks for your contribution, I changed the content to English.

Copy link
Contributor Author

@sdhzwc sdhzwc left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I have completed the modifications

@qingwli
Copy link
Member

qingwli commented Oct 12, 2023

Please fix ut

Error:  Failures: 
Error:    TaskDefinitionServiceImplTest.updateTaskDefinition:201 Expected org.apache.dolphinscheduler.api.exceptions.ServiceException to be thrown, but nothing was thrown.

@codecov-commenter
Copy link

codecov-commenter commented Oct 13, 2023

Codecov Report

Merging #14801 (a9c3b1a) into dev (2350775) will decrease coverage by 0.02%.
Report is 1 commits behind head on dev.
The diff coverage is 41.57%.

❗ Current head a9c3b1a differs from pull request most recent head e83e6c0. Consider uploading reports for the commit e83e6c0 to get more accurate results

@@             Coverage Diff              @@
##                dev   #14801      +/-   ##
============================================
- Coverage     39.02%   39.00%   -0.02%     
- Complexity     4600     4603       +3     
============================================
  Files          1231     1231              
  Lines         43300    43362      +62     
  Branches       4792     4794       +2     
============================================
+ Hits          16896    16914      +18     
- Misses        24526    24569      +43     
- Partials       1878     1879       +1     
Files Coverage Δ
...scheduler/plugin/task/api/model/DependentItem.java 0.00% <ø> (ø)
...er/api/service/impl/TaskDefinitionServiceImpl.java 47.44% <80.43%> (+1.42%) ⬆️
...cheduler/plugin/task/api/utils/DependentUtils.java 76.92% <0.00%> (-11.32%) ⬇️
...k/dependent/DependentAsyncTaskExecuteFunction.java 0.00% <0.00%> (ø)
...cheduler/server/master/utils/DependentExecute.java 0.00% <0.00%> (ø)

... and 2 files with indirect coverage changes

📣 We’re building smart automated test selection to slash your CI/CD build times. Learn more

@sdhzwc
Copy link
Contributor Author

sdhzwc commented Oct 16, 2023

#15036

@SbloodyS SbloodyS changed the title [Bug] [API] Fix task definition edit doesn't work [Fix-15036] [API] Fix task definition edit doesn't work Oct 16, 2023
@SbloodyS SbloodyS added 3.1.x for 3.1.x version 3.2.1 bug Something isn't working labels Oct 16, 2023
@SbloodyS SbloodyS added this to the 3.1.9 milestone Oct 16, 2023
@sdhzwc sdhzwc requested a review from SbloodyS October 17, 2023 09:30
Copy link
Member

@SbloodyS SbloodyS left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

LGTM

Copy link
Contributor

@davidzollo davidzollo left a comment

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

+1
LGTM

@sonarcloud
Copy link

sonarcloud bot commented Oct 25, 2023

Kudos, SonarCloud Quality Gate passed!    Quality Gate passed

Bug A 0 Bugs
Vulnerability A 0 Vulnerabilities
Security Hotspot A 0 Security Hotspots
Code Smell A 0 Code Smells

No Coverage information No Coverage information
No Duplication information No Duplication information

@davidzollo davidzollo merged commit ae847ba into apache:dev Oct 25, 2023
52 of 53 checks passed
xdu-chenrj pushed a commit to xdu-chenrj/dolphinscheduler that referenced this pull request Oct 30, 2023
* [Bug] [task definition] 修复任务定义修改,工作流无法生效问题

* [Bug] [API] Fix task check apply

* [BUG][API] fix updateTaskDefinition method ut

* [BUG][API] fix updateTaskDefinition method code specification

* [BUG][API] fix one task corresponds to multiple workflow problems

* [BUG][API] queryProcessTaskRelationByTaskCodeAndTaskVersion method adjust

* [BUG][API] fix updateTaskDefinition method update

---------

Co-authored-by: David Zollo <dailidong66@gmail.com>
Co-authored-by: 旺阳 <wang@lqwang.net>
Co-authored-by: xiangzihao <460888207@qq.com>
sdcxwc pushed a commit to sdcxwc/dst-dolphinscheduler that referenced this pull request Nov 9, 2023
* [Bug] [task definition] 修复任务定义修改,工作流无法生效问题

* [Bug] [API] Fix task check apply

* [BUG][API] fix updateTaskDefinition method ut

* [BUG][API] fix updateTaskDefinition method code specification

* [BUG][API] fix one task corresponds to multiple workflow problems

* [BUG][API] queryProcessTaskRelationByTaskCodeAndTaskVersion method adjust

* [BUG][API] fix updateTaskDefinition method update

---------

Co-authored-by: David Zollo <dailidong66@gmail.com>
Co-authored-by: 旺阳 <wang@lqwang.net>
Co-authored-by: xiangzihao <460888207@qq.com>
@zhuangchong zhuangchong modified the milestones: 3.1.9, 3.2.1 Dec 18, 2023
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
3.1.x for 3.1.x version 3.2.1 backend bug Something isn't working first time contributor First-time contributor ready-to-merge
Projects
None yet
Development

Successfully merging this pull request may close these issues.

[Bug] [API] Fix task definition edit doesn't work
8 participants