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
David
1f838e6102
Merge pull request #6124 from apache/json_split_two
...
[Feature][JsonSplit-api] api module controller design
3 years ago
kezhenxu94
2ac6d2f342
Allow merge as there are many PR has multiple authors ( #6126 )
3 years ago
Kirs
9508d1e978
[SPI][TASK]TaskPlugin ( #6122 )
...
* [Improvement][dao]When I search for the keyword description, the web UI shows empty (#5952 )
* [Bug][WorkerServer] SqlTask NullPointerException #5549
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword Modify User, the web UI shows empty #5428
* [Improvement][dao]When I search for the keyword description, the web UI shows empty #5428
* fix the readme typing issue (#5998 )
* Fix unchecked type conversions
* Use indentation level reported by checkstyle
* Reorganize CI workflows to fasten the wasted time and resources (#6011 )
* Add standalone server module to make it easier to develop (#6022 )
* Task node of SWITCH (#5939 )
* [Feature-#5273][server-master] Task node of SWITCH (#5922 )
Co-authored-by: wangxj <wangxj31>
* remove description of bonecp (#6030 )
Co-authored-by: shaojwu <shaojwu@ebay.com>
* [Improvement][Api Module]split alert group list-paging interface (#5941 )
* [Improvement][Api Module]split alert group list-paging interface
* [FIX-#6007]Wrong complement date (#6026 )
* [FIX-#6007]Wrong complement date
* [style]Wrong complement date
* [Improvement-6024][dist] Remove useless packaging commands (#6029 )
·Remove useless packaging commands in dolphinscheduler-bin.xml
This closes #6024
Co-authored-by: mask <liuhu@zhiyoutec.com>
* [FIX-5908][MasterServer] When executing an compensation task, the execution thread would have a NPE (#5909 )
* fix the npe in MasterExec
* fix the compile error
* Add `.asf.yaml` to easily set the GitHub metadata (#6035 )
* fix dead server cannot stop (#6046 )
* Enhancement Translation (#6042 )
* replaced Loading... with i18n
* modified Edit zh_CN translation
* Delete zh_CN.js
Co-authored-by: David <dailidong66@gmail.com>
* fix bug #6053 zh_CN.js is lost
* [Fix-6038][ui] width of "SQL Statement" in Dag FormLineModal will be shrunk if sql line is too long (#6040 )
This closes #6038
* [Improvement] Fix inefficient map iterator (#6004 )
* Fix inefficient map iterator
* Use forEach and remove call to valueOf
* Modify AbstractParameters
* Enhance `StandaloneServer` so that we don't need to update the version number manually (#6074 )
* Remove invalid character in `.asf.yaml` (#6075 )
* Remove invalid character `\n` in `.asf.yaml` (#6077 )
It turns out that the invalid character is `\n`
* Add alert server into standalone-server as well and some minor polish (#6087 )
* Support starting standalone server in Docker image (#6102 )
Also remove unused class
* [Feature-4355][Master-Worker-API] improvements of master and scheduler module (#6095 )
* [Feature-4355][Master-Worker-API] improvements of master and scheduler module (#6085 )
* master refactor:
1. spi for task submit and other actions(pause, kill)
2. remove threads for process instance and task instance.
3. add events for process instance and task instance
* ut npe
* add try catch
* code style
* fix critical bugs
* fix critical bugs
* fix critical bugs
* fix critical bugs
* Remove unused params in SwitchTaskTest (#6109 )
* [Feature-5987][Server] Support to set multiple environment configs for a certain worker. (#6082 )
* support multi environments
* add some test cases
* add an environment vue component
* improve environment form
* improve environment form
* add environment worker group relation
* add environment worker group relation
* add the environment choice for formModel
* set an environment for the task
* modify the modal form of starting process
* add the environment config to TaskExecutionContext
* add the environment config to the timing form
* fix conflicts
* fix issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some issues of the code style
* fix some bugs in the code review
* add the same table and columns to support H2
* fix some bugs
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
* [Plugin][Task]Task Spi
Co-authored-by: didiaode18 <563646039@qq.com>
Co-authored-by: Roy <yongjuncao1213@gmail.com>
Co-authored-by: lyxell <alyxell@kth.se>
Co-authored-by: Wenjun Ruan <wenjun@apache.org>
Co-authored-by: kezhenxu94 <kezhenxu94@apache.org>
Co-authored-by: myangle1120 <942542838@qq.com>
Co-authored-by: wangxj3 <857234426@qq.com>
Co-authored-by: gabry.wu <gabrywu@apache.org>
Co-authored-by: shaojwu <shaojwu@ebay.com>
Co-authored-by: Shukun Zhang <60541766+andream7@users.noreply.github.com>
Co-authored-by: linquan <1175687813@qq.com>
Co-authored-by: mask <39329477+Narcasserun@users.noreply.github.com>
Co-authored-by: mask <liuhu@zhiyoutec.com>
Co-authored-by: kyoty <echohlne@gmail.com>
Co-authored-by: RichardStark <49977764+RichardStark@users.noreply.github.com>
Co-authored-by: David <dailidong66@gmail.com>
Co-authored-by: lenboo <baoliang.leon@gmail.com>
Co-authored-by: lilyzhou <lj_zhou@outlook.com>
Co-authored-by: OS <29528966+lenboo@users.noreply.github.com>
Co-authored-by: junfan.zhang <zuston.shacha@gmail.com>
Co-authored-by: Hua Jiang <jianghuachinacom@163.com>
3 years ago
lenboo
c4478f8707
code style
3 years ago
lenboo
26d578e381
update
3 years ago
lenboo
331a8e9fb0
code style
3 years ago
lenboo
501c93602a
code style
3 years ago
lenboo
5d27e1879d
Merge remote-tracking branch 'upstream/dev' into json2
...
# Conflicts:
# .github/actions/translate-on-issue
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AccessTokenController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertGroupController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertPluginInstanceController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/LoggerController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProjectController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/QueueController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskInstanceController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TenantController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UiPluginController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UsersController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/WorkerGroupController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/EnvironmentWorkerGroupRelationService.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskInstanceService.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataSourceServiceImpl.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/ProcessDefinitionServiceImpl.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SchedulerServiceImpl.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskInstanceServiceImpl.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/exportprocess/TaskNodeParamFactory.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AbstractControllerTest.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AlertGroupControllerTest.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceControllerTest.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/SchedulerControllerTest.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorService2Test.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TaskInstanceServiceTest.java
# dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
# dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNode.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/WorkflowExecuteThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/DependentTaskProcessFactory.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/ShellCommandExecutor.java
# dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/SwitchTaskTest.java
# dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/WorkflowExecuteThreadTest.java
# dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
# dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java
# dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js
# 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
# dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
# dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
# dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
# dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
# sql/dolphinscheduler_h2.sql
3 years ago
lenboo
b661ec9675
Merge remote-tracking branch 'upstream/dev' into json2
...
# Conflicts:
# .github/actions/translate-on-issue
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AccessTokenController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertGroupController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/AlertPluginInstanceController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataAnalysisController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/DataSourceController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ExecutorController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/LoggerController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProjectController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/QueueController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ResourcesController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/SchedulerController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TaskInstanceController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/TenantController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UiPluginController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/UsersController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/WorkerGroupController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/EnvironmentWorkerGroupRelationService.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ExecutorService.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionService.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/SchedulerService.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/TaskInstanceService.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/DataSourceServiceImpl.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/ProcessDefinitionServiceImpl.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessInstanceServiceImpl.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/SchedulerServiceImpl.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/TaskInstanceServiceImpl.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/utils/exportprocess/TaskNodeParamFactory.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AbstractControllerTest.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/AlertGroupControllerTest.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessInstanceControllerTest.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/SchedulerControllerTest.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/DataAnalysisServiceTest.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ExecutorService2Test.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionServiceTest.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessInstanceServiceTest.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/TaskInstanceServiceTest.java
# dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/Constants.java
# dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNode.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/WorkflowExecuteThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/task/DependentTaskProcessFactory.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/ShellCommandExecutor.java
# dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/SwitchTaskTest.java
# dolphinscheduler-server/src/test/java/org/apache/dolphinscheduler/server/master/WorkflowExecuteThreadTest.java
# dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
# dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java
# dolphinscheduler-ui/src/js/conf/home/pages/dag/_source/dag.js
# 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
# dolphinscheduler-ui/src/js/conf/home/pages/projects/pages/definition/pages/list/_source/start.vue
# dolphinscheduler-ui/src/js/conf/home/store/security/actions.js
# dolphinscheduler-ui/src/js/module/i18n/locale/en_US.js
# dolphinscheduler-ui/src/js/module/i18n/locale/zh_CN.js
# sql/dolphinscheduler_h2.sql
3 years ago
JinyLeeChina
baa8f30c2b
[Feature-5498][JsonSplit-api] fix some ut ( #6121 )
...
* fix some ut
* fix some ut
* fix some ut
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago