Skip to content

Commit f56d51c

Browse files
authored
[DSIP-72][Dynamic Task] Remove dynamic task type (#16842)
* remove dynamic task type * remove dynamic task type * remove dynamic task type * resolve conflicts * resolve conflicts * resolve conflicts * fix comment * fix ci
1 parent 271fa23 commit f56d51c

File tree

45 files changed

+17
-1435
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

45 files changed

+17
-1435
lines changed

docs/configs/docsdev.js

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -101,10 +101,6 @@ export default {
101101
title: 'SubWorkflow',
102102
link: '/en-us/docs/dev/user_doc/guide/task/sub-workflow.html',
103103
},
104-
{
105-
title: 'Dynamic',
106-
link: '/en-us/docs/dev/user_doc/guide/task/dynamic.html',
107-
},
108104
{
109105
title: 'Dependent',
110106
link: '/en-us/docs/dev/user_doc/guide/task/dependent.html',
@@ -816,10 +812,6 @@ export default {
816812
title: 'SubWorkflow',
817813
link: '/zh-cn/docs/dev/user_doc/guide/task/sub-workflow.html',
818814
},
819-
{
820-
title: 'Dynamic',
821-
link: '/zh-cn/docs/dev/user_doc/guide/task/dynamic.html',
822-
},
823815
{
824816
title: 'Dependent',
825817
link: '/zh-cn/docs/dev/user_doc/guide/task/dependent.html',

docs/docs/en/guide/task/dynamic.md

Lines changed: 0 additions & 77 deletions
This file was deleted.

docs/docs/en/guide/upgrade/incompatible.md

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -36,4 +36,5 @@ This document records the incompatible updates between each version. You need to
3636
* Remove the `registry-disconnect-strategy` in `application.yaml` ([#16821])(https://github.com/apache/dolphinscheduler/pull/16821)
3737
* Remove `exec-threads` in worker's `application.yaml`, please use `physical-task-config`;Remove `master-async-task-executor-thread-pool-size` in master's `application.yaml`, please use `logic-task-config` ([#16790])(https://github.com/apache/dolphinscheduler/pull/16790)
3838
* Drop unused column `other_params_json` in `t_ds_worker_group` ([#16860])(https://github.com/apache/dolphinscheduler/pull/16860)
39+
* Remove the `Dynamic` from the `Task Plugin` ([#16482])(https://github.com/apache/dolphinscheduler/pull/16842)
3940

docs/docs/zh/guide/task/dynamic.md

Lines changed: 0 additions & 76 deletions
This file was deleted.

docs/docs/zh/guide/upgrade/incompatible.md

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -32,6 +32,7 @@
3232
* 废弃从 1.x 至 2.x 的升级代码 ([#16543])(https://github.com/apache/dolphinscheduler/pull/16543)
3333
* 移除 `数据质量` 模块 ([#16794])(https://github.com/apache/dolphinscheduler/pull/16794)
3434
*`application.yaml`中移除`registry-disconnect-strategy`配置 ([#16821])(https://github.com/apache/dolphinscheduler/pull/16821)
35-
* 在worker的`application.yaml`中移除`exec-threads`,使用`physical-task-config`替代;在master的`application.yaml`中移除`master-async-task-executor-thread-pool-size`使用`logic-task-config`替代 ([#16790])(https://github.com/apache/dolphinscheduler/pull/16790)
36-
*`t_ds_worker_group` 表中移除 无用的`other_params_json`字段 ([#16860])(https://github.com/apache/dolphinscheduler/pull/16860)
35+
*`worker``application.yaml` 中移除 `exec-threads`,使用`physical-task-config`替代;在master的`application.yaml`中移除`master-async-task-executor-thread-pool-size`使用`logic-task-config`替代 ([#16790])(https://github.com/apache/dolphinscheduler/pull/16790)
36+
*`t_ds_worker_group` 表中移除 无用的 `other_params_json` 字段 ([#16860])(https://github.com/apache/dolphinscheduler/pull/16860)
37+
*`任务插件` 中移除 `Dynamic` 类型 ([#16482])(https://github.com/apache/dolphinscheduler/pull/16842)
3738

-27.2 KB
Binary file not shown.
-24.1 KB
Binary file not shown.

docs/img/tasks/icons/dynamic.png

-10.4 KB
Binary file not shown.

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -274,8 +274,6 @@ public enum Status {
274274
NOT_SUPPORT_SSO(10211, "Not support SSO login.", "不支持SSO登录"),
275275
STATE_CODE_ERROR(10212, "state inconsistency or state and code not pair", "状态码前后不一致或状态码和code不匹配"),
276276

277-
TASK_INSTANCE_NOT_DYNAMIC_TASK(10213, "task instance {0} is not dynamic", "任务实例[{0}]不是Dynamic类型"),
278-
279277
CREATE_PROJECT_PARAMETER_ERROR(10214, "create project parameter error", "创建项目参数错误"),
280278

281279
UPDATE_PROJECT_PARAMETER_ERROR(10215, "update project parameter error", "更新项目参数错误"),

dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/WorkflowInstanceServiceImpl.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -484,10 +484,6 @@ public List<DynamicSubWorkflowDto> queryDynamicSubWorkflowInstances(User loginUs
484484
throw new ServiceException(Status.TASK_INSTANCE_NOT_EXISTS, taskId);
485485
}
486486

487-
if (!TaskTypeUtils.isDynamicTask(taskInstance.getTaskType())) {
488-
putMsg(result, Status.TASK_INSTANCE_NOT_DYNAMIC_TASK, taskInstance.getName());
489-
throw new ServiceException(Status.TASK_INSTANCE_NOT_EXISTS, taskId);
490-
}
491487
List<RelationSubWorkflow> relationSubWorkflows = relationSubWorkflowMapper
492488
.queryAllSubWorkflowInstance((long) taskInstance.getWorkflowInstanceId(),
493489
taskInstance.getTaskCode());

0 commit comments

Comments
 (0)