Kirs
540fd9dc08
Only allow squash merge ( #6274 )
3 years ago
Wangyizhi1
69a153c5f5
[Fix-6139][UI] Fix missing relationship issue ( #6258 )
...
* the relationship is missing in kinship
* Fix missing environmentCode parameter issue when modifying the process
3 years ago
Kirs
fab4eae923
[SPI][Task]fix Task parse Err ( #6244 )
...
* [SPI][Task]fix Task parse Err
3 years ago
LiuBodong
58da46b129
[Fix][API] fix TaskDefinitionLog save error ( #6246 )
...
The reason is when saving the TaskDefinitionLog, the environmentCode field uses 'taskDefinition' which is NOT defined instead of 'taskDefinitionLog' defined in the 'foreach declaration'. so just change 'taskDefinition' to 'taskDefinitionLog' in 'TaskDefinitionLogMapper.xml'
3 years ago
Kirs
fced3892ee
[Fix][Task] Wrong complement date ( #6009 ) ( #6186 )
...
* [Fix][Task] Wrong complement date (#6009 )
3 years ago
Wangyizhi1
070b280f56
fix api error in dependent task ( #6238 )
3 years ago
Kirs
b90152fc2e
[SPI][Task]add SQL Task ( #6237 )
...
Add Sql Task And Fix Task Parse Err
3 years ago
LiuBodong
a1e447d399
[StandaloneServer][BUG]Fix workflow can't save correctly ( #6214 ) ( #6215 )
...
* [StandaloneServer][BUG]Fix workflow can't save correctly (#6214 )
* [StandaloneServer][BUG] Command can't be saved to h2 database (#6214 )
* [API][BUG] Update embedded h2 sql, use process_definition_code instead of unused process_definition_id (#6214 )
* Update dolphinscheduler_h2.sql
update scale of process_definition_code in t_ds_error_command
Co-authored-by: liubodong <liubodong>
3 years ago
break60
6aafa81aff
fixBug('#6172') Dag node name value judgment error ( #6175 )
...
Co-authored-by: xiangcaibiao <caibiao.xiang@sinocare.com>
3 years ago
Wangyizhi1
14feda996d
Improve workflow lineage interaction ( #6230 )
3 years ago
JinyLeeChina
9d0b00c1b7
[Fix-6139][API]fix envCode in task_definition and process switchVersion ( #6231 )
...
* fix envCode in task_definition and process switchVersion
* fix conflicts
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
Kirs
fa0b86ac82
[Fix][Registry]server listener err ( #6232 )
...
* [Fix][Registry]server listener err
3 years ago
Hua Jiang
5fead427f2
[Bug-6152][Server] Fix the the exception of manual workflow execution ( #6209 )
3 years ago
Tandoy
c1496d8a74
[Bug] [ui] fix cannot edit project ( #6227 )
...
* fix cannot edit project
* It has been fixed that when editing a project, if you do not modify the projectName, a project already exists error will be thrown.
3 years ago
Wangyizhi1
f4a2b6df50
[Fix-6139][UI] fix some UI bugs ( #6225 )
...
* Hide the reference task feature
* fix the bug that Element-ui(2.13.2) auto focus on the first input
* Fix delete process version error
* add switch and tis task icons
* Change the default value of environmentCode to - 1
* Replace projectId to projectCode & remove definitionList field in the DEPENDENT node
* fix delete process instance error
* Fix error entering sub process instance page
3 years ago
JinyLeeChina
07d6542feb
[Fix-6139][API] fix workFlowLineage relation ( #6217 )
...
* fix bug of view-tree api
* fix bug of view-tree api
* fix ut
* fix ut
* fix master buildFlowDag error
* fix workFlowLineage relation
* fix ut
* fix ut
* fix ut
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
mask
259ec909d1
[Improvement-6198][task] remove Sparktaskchannelfactory duplicate declaration ( #6199 )
...
* remove Sparktaskchannelfactory duplicate declaration
3 years ago
Tandoy
6820684307
Fix the error when using CreateDolphinScheduler to build a local development environment to initialize the table and data for the first time ( #6210 )
...
close #6158
3 years ago
OS
8694b9c8f9
fix bug-6208 json parse error in sub process ( #6211 )
3 years ago
Kirs
ac943bca6a
[SPI]Fix Plugin Logger coverage ( #6206 )
3 years ago
JinyLeeChina
71e2c8808b
[Fix-6194] [Server] fix master buildFlowDag error ( #6195 )
...
* fix bug of view-tree api
* fix bug of view-tree api
* fix ut
* fix ut
* fix master buildFlowDag error
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
Kirs
7029062f4c
[Improvement][Task]Check the task plugin configuration when the worke… ( #6184 )
...
* [Improvement][Task]Check the task plugin configuration when the worker starts
3 years ago
Jiajie Zhong
170280fab2
Simplify constants variables ( #6183 )
...
* Combine `alter` and `registry` properties,
bese on https://github.com/apache/dolphinscheduler/pull/6180
* Remove duplicate variable `SLASH` and `SINGLE_SLASH`
3 years ago
JinyLeeChina
14e4d7086d
[Fix-6139][API] fix bug of view-tree api ( #6188 )
...
* fix bug of view-tree api
* fix bug of view-tree api
* fix ut
* fix ut
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
Wangyizhi1
b79630488d
convert process definition id to code ( #6191 )
3 years ago
Wangyizhi1
ca488fcfa6
copy configs from taskDefinition ( #6179 )
3 years ago
DittoTool
a245e141d6
Inefficient Usages of Java Collections ( #6187 )
3 years ago
Hua Jiang
6dedafb8ff
fix the issue about mysql ddl for environment_code ( #6160 )
...
* set the default value of the environment code to be -1
3 years ago
Kirs
58b694a85c
[BUG][Plugin] Fix #6167 ( #6177 )
3 years ago
Martin Huang
0715be34d5
[Fix-6166][task-plugin]Fix Python Task Execution Error ( #6167 )
...
* fix python task execution error
* delete AbstractTask#setCommand
3 years ago
kezhenxu94
ea2a9dbcb2
Clean up third-party files that are not mentioned in LICENSE ( #6165 )
3 years ago
Wangyizhi1
42966bea97
[Fix-6139][UI] fix some bugs in UI ( #6163 )
...
* Disable delete button when the process is online
* the jump affirm
* process tree code
* put the processInstanceId of Gantt
* fix kinship bugs
* modify lineage id to code
3 years ago
Kerwin
f75b5be28f
fix master server task execute processor register. ( #6162 )
3 years ago
JinyLeeChina
4ddfb855a3
[Fix-6156] [API] refactor workflow lineage api ( #6157 )
...
* fix mysql create sentence bug
* fix mysql create sentence bug
* fix genTaskCodeList return same code and save proces error
* refactor workflow lineage api
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
kezhenxu94
a632be73c0
Clean up unused util classes... ( #6154 )
3 years ago
kezhenxu94
291b5eba82
Adopt new GitHub issue template ( #6153 )
3 years ago
JinyLeeChina
e8ddc9103d
[Bug][API] fix genTaskCodeList return same code and save proces error ( #6150 )
...
* fix mysql create sentence bug
* fix mysql create sentence bug
* fix genTaskCodeList return same code and save proces error
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
Wangyizhi1
cca48d0a92
[Feature][JsonSplit-api] Improve some dag/formModel features ( #6144 )
...
* Add the prev tasks selector
* fix CONDITIONS node bugs
* fix code smells
3 years ago
Kerwin
bcb1ccba6f
[Bug][sql] fix mysql create sentence bug ( #6148 )
...
* fix mysql error.
3 years ago
JinyLeeChina
dd5acfb7f0
[Bug][sql] fix mysql create sentence bug ( #6140 )
...
* fix mysql create sentence bug
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
Jiajie Zhong
71cb669091
Correct java doc ( #6141 )
...
Correct doc in project and processDefinition
Controller
3 years ago
kezhenxu94
9c211bd592
Require reviewers' approval before the PR can be merged ( #6143 )
3 years ago
OS
edb8f3c435
[BUG][API] the interface of 'authed project' is missed ( #6136 )
...
* fix bug: auth project and auth datasource error.
* fix bug: cannot save process definition if environment_code is null;
3 years ago
Kerwin
9d7f70bca7
Merge pull request #6133 from CalvinKirs/task-end
...
[Feature][Plugin]TaskSPI
3 years ago
CalvinKirs
5b98ea0104
fix code style
3 years ago
CalvinKirs
d6d3980241
fix code style
3 years ago
CalvinKirs
ac8fafa343
fix code style
3 years ago
CalvinKirs
2dd5279388
Merge remote-tracking branch 'upstream/dev' into task-end
...
# Conflicts:
# .asf.yaml
# dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/FuncUtils.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AlertGroupControllerTest.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorService2Test.java
# dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
# dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/StateEventType.java
# dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java
# dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java
# dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
# dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
# dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.xml
# dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionLogMapper.xml
# dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionMapper.xml
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/ConditionsTaskExecThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/DependentTaskExecThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessor.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/ConditionTaskProcessor.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/DependentTaskProcessor.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/ConditionsTaskExecThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/DependentTaskExecThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/MasterBaseTaskExecThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/MasterTaskExecThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/SubProcessTaskExecThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/WorkerManagerThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/python/PythonTask.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
# dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/WorkflowExecuteThreadTest.java
# dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessorTest.java
# dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThreadTest.java
# dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/runner/WorkerManagerThreadTest.java
# dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/PythonCommandExecutorTest.java
# dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/http/HttpTaskTest.java
# dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTaskTest.java
# dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
# dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/CronUtils.java
# dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java
# dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/DolphinSchedulerPlugin.java
# dolphinscheduler-standalone-server/pom.xml
# dolphinscheduler-standalone-server/src/main/java/org/apache/dolphinscheduler/server/StandaloneServer.java
# dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/ShellCommandExecutor.java
# dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/src/main/java/org/apache/dolphinscheduler/plugin/task/procedure/ProcedureTaskChannelFactory.java
# dolphinscheduler-task-plugin/dolphinscheduler-task-python/src/main/java/org/apache/dolphinscheduler/plugin/task/python/PythonCommandExecutor.java
# dolphinscheduler-task-plugin/dolphinscheduler-task-shell/src/main/java/org/apache/dolphinscheduler/plugin/task/shell/ShellTask.java
# dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTask.java
# dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/SqoopTask.java
# dolphinscheduler-ui/package.json
# dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
# dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
# dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
# sql/dolphinscheduler_h2.sql
3 years ago
CalvinKirs
dbb4adf6c3
Merge remote-tracking branch 'upstream/dev' into task-end
...
# Conflicts:
# .asf.yaml
# dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/FuncUtils.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ExecutorServiceImpl.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AlertGroupControllerTest.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorService2Test.java
# dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
# dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/enums/StateEventType.java
# dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/Command.java
# dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ErrorCommand.java
# dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/ProcessInstance.java
# dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/entity/TaskDefinition.java
# dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ScheduleMapper.xml
# dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionLogMapper.xml
# dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskDefinitionMapper.xml
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/ConditionsTaskExecThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/DependentTaskExecThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/WorkflowExecuteThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/CommonTaskProcessor.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/ConditionTaskProcessor.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/DependentTaskProcessor.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/WorkerServer.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/ConditionsTaskExecThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/DependentTaskExecThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/MasterBaseTaskExecThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/MasterTaskExecThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/SubProcessTaskExecThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/WorkerManagerThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/python/PythonTask.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTask.java
# dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/WorkflowExecuteThreadTest.java
# dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/processor/TaskKillProcessorTest.java
# dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThreadTest.java
# dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/runner/WorkerManagerThreadTest.java
# dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/PythonCommandExecutorTest.java
# dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/http/HttpTaskTest.java
# dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/worker/task/sql/SqlTaskTest.java
# dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
# dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/quartz/cron/CronUtils.java
# dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java
# dolphinscheduler-spi/src/main/java/org/apache/dolphinscheduler/spi/DolphinSchedulerPlugin.java
# dolphinscheduler-standalone-server/pom.xml
# dolphinscheduler-standalone-server/src/main/java/org/apache/dolphinscheduler/server/StandaloneServer.java
# dolphinscheduler-task-plugin/dolphinscheduler-task-api/src/main/java/org/apache/dolphinscheduler/plugin/task/api/ShellCommandExecutor.java
# dolphinscheduler-task-plugin/dolphinscheduler-task-procedure/src/main/java/org/apache/dolphinscheduler/plugin/task/procedure/ProcedureTaskChannelFactory.java
# dolphinscheduler-task-plugin/dolphinscheduler-task-python/src/main/java/org/apache/dolphinscheduler/plugin/task/python/PythonCommandExecutor.java
# dolphinscheduler-task-plugin/dolphinscheduler-task-shell/src/main/java/org/apache/dolphinscheduler/plugin/task/shell/ShellTask.java
# dolphinscheduler-task-plugin/dolphinscheduler-task-spark/src/main/java/org/apache/dolphinscheduler/plugin/task/spark/SparkTask.java
# dolphinscheduler-task-plugin/dolphinscheduler-task-sqoop/src/main/java/org/apache/dolphinscheduler/plugin/task/sqoop/SqoopTask.java
# dolphinscheduler-ui/package.json
# dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.scss
# dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.vue
# dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/formModel/formModel.vue
# sql/dolphinscheduler_h2.sql
3 years ago
Kerwin
18047881d5
fix task plugin shell exec ( #6128 )
3 years ago