Commit Graph

811 Commits

Author SHA1 Message Date
xiaoguaiguai
44b24cd3df
When the SQL node is selected (#6851)
The data source list needs to scroll continuously, and the search efficiency is low

Add a quick search box to quickly locate the data source to be selected
2021-11-15 17:21:34 +08:00
DuChaoJiaYou
36c19748a6
[Feature-6600][UI] Implement page about task-definition (#6762)
* fix api error in dependent task

* feat: This is a connecting test

* feat: second push test

* feat: email test

* [Feature]add taskdefinition

add new pages named taskDifinition
add new router
add new action in store/dag

* [Feature] add/edit/view task definition

* [DS-6600][feat][UI] Add page about task-definition list

* Add page about task-definition list
* Add create/edit/view/delete task-definition
* Add research task-definition

This closes #6600

* modify API_BASE

Co-authored-by: wangyizhi <wangyizhi1_yewu@cmss.chinamobile.com>
Co-authored-by: duchao <duchao@cmss.chinamobile.com>
2021-11-15 13:54:28 +08:00
OS
880c1d28ff
[Feature][master] change sub process id to code. (#6846)
* 6597 change sub process id to code.

* 6597 change sub process id to code.

* 6597 change sub process id to code.

* 6597 change sub process id to code.

* 6597 change sub process id to code.

* 6597 change sub process id to code.

* code style

* fix ut process

* fix ut process
2021-11-15 01:00:44 +08:00
wangyizhi
e2d516f279
Optimize DAG page opening speed (#6830) 2021-11-12 15:48:55 +08:00
罗铭涛
975131e913
[Improvement#6655] [UI] remove registry monitor (#6789)
* [DS-6655][fix] remove zkmonitor
- delete zkmonitor ui

* [DS-6655][fix] remove zkmonitor
- delete zkmonitor ui
- Modify the actions.js comma

* [DS-6655][fix] remove zkmonitor
- remove all backend API

Co-authored-by: Kirs <acm_master@163.com>
2021-11-11 19:59:10 +08:00
OS
24bd8a16e1
[Bug][Master] The task of dependent should use taskCode (#6730)
* fix #6682 The task of dependent should use taskCode

* fix #6682 The task of dependent should use taskCode
2021-11-07 23:20:35 +08:00
wangyizhi
b226253eec
Replace taskName with taskCode (#6719) 2021-11-07 10:35:29 +08:00
Yanbin Lin
a728c85a92
[Fix-6649][UI] Get project according to code (#6649) (#6650)
Co-authored-by: linyanbin <linyanbin@lizhi.fm>
2021-11-06 10:12:01 +08:00
myangle1120
b8d0f06ad8
[Feature-#6268][UI]Serial execte proces (#6267)
* serial

* del ip
2021-11-05 21:36:44 +08:00
zekai-li
f5d8356dc3
[Fix][UI]Fix UI adaptation problem and semantic error (#6651)
* [Fix][UI]Fix UI adaptation Problem

* [Fix][UI]Fix semantic error
2021-11-03 18:43:56 +08:00
jon-qj
86c85114b2
make alert instance page display more friendly (#6635)
* make alert instance page display more friendly

* Update EmailAlertChannelTest.java
2021-10-31 21:16:10 +08:00
kezhenxu94
251255009a
Add end-to-end test framework and some basic cases (#6419) 2021-10-20 21:14:26 +08:00
wangyizhi
fa102afad0
fix import process definition url error (#6567) 2021-10-20 18:58:23 +08:00
wangyizhi
5dfb0163c2
fix switch node cannot get branch flow (#6565) 2021-10-20 16:55:38 +08:00
wangyizhi
4d0869fcc0
fix DAG environment list error (#6551) 2021-10-16 22:45:55 +08:00
OS
8606cbd493
fix bug: 6523 Failed to authorize resource (#6524) 2021-10-14 00:31:23 +08:00
Hua Jiang
6e70e51e9f
remove the verification of the task name in the formModel.vue (#6464) 2021-10-11 10:07:57 +08:00
wangyizhi
eb21a1763e
fix UI updateProcessInstance interface parameter error (#6487) 2021-10-10 23:18:07 +08:00
百岁
d284e44d52
Rename tis to pigeon from backend layer (#6437)
* add mock getTaskLogName() for UT test pass

* make task-tis rename to task-pigeon

* rename module name 'tis' to pigeon

* rename module name 'tis' to pigeon,make sanity check pass

* remove execute console.log()
2021-10-01 14:54:04 +08:00
jixiang
1621d0a5c3
[Feature-6423][TIS] Rename tis to pigeon (#6427)
Co-authored-by: jixiang <jixiang@cmss.chinamobile.com>
2021-09-30 18:30:26 +08:00
Jiajie Zhong
9c07c7d7ed
Move waterdrop to the end of task list (#6425)
closes: #6424
2021-09-30 18:23:42 +08:00
wangyizhi
a9d805d791
[DS-6417][feat] add ‘view log' in the task instance context menu (#6421) 2021-09-30 11:41:36 +08:00
Kirs
67508d8d1b
update project version to 2.0.0-SNAPSHOT (#6383) 2021-09-28 12:00:43 +08:00
jon-qj
cdcbe84c8a
[Fix] [#6219] modify user's information and DS's page shows wrong information at the frond-end (#6341)
* provide the default value(task.plugin.dir)

* unset user information

* unset user information
2021-09-27 23:31:06 +08:00
Liyue
bc8d610e87
fix the mismatch of upload url between frontend and backend (#6226)
* fix: fix the  url mismatch between frontend and backend

* fix the url mismatch between frontend and backend

* fix the resource download url

* fix: update for unit test
2021-09-26 20:56:03 +08:00
百岁
34352c1bf8
Enhance using experience of DataX by introduce TIS (#6229)
* Enhance using experience of DataX by introduce TIS [Feature-5992]

* Enhance using experience of DataX by introduce TIS [Feature-5992]

* fix stylecheck error

* make testCase pass

* make dev testCase pass

* add new java dependency Java-WebSocket

* modfiy TISParameters.java avoid to name confliction

* add InterruptedException checking

* reAdd async-http-client annotation

* in order to staisfy the coverage degree add test which has been removed

* make testCase pass

* make testCase pass

* add jacoco dependency

* make code duplications be more lower

* add Java-WebSocket dependency in root pom

* remove useless code comment

* make tis http apply path and post body configurable ,the params save in config.properites

* Remove the dangerous instance of double-checked locking
2021-09-26 18:40:41 +08:00
Yao-chen-ecnu
2d02f78ba7
workflow level task dry run UI (#6173)
* workflow level task dry run UI

* Update start.vue

* Update start.vue

* Create start.vue

* Update start.vue

* Update list.vue

* Update en_US.js

* Update zh_CN.js

* Update start.vue

* Update en_US.js

* Update zh_CN.js

* Update start.vue

* Update list.vue

* Update list.vue

Co-authored-by: yao-chen-ecnu <51205902080@stu.ecnu.edu.cn>
2021-09-26 11:56:10 +08:00
Tandoy
b71f6aea7a
·fix delete project error (#6174) 2021-09-25 11:58:48 +08:00
Wangyizhi1
5dcfad9849
fix task-instance & process-instance page date backfill bug (#6344) 2021-09-25 11:52:43 +08:00
Wangyizhi1
9be7f7931d
Fix errors when viewing variables (#6335) 2021-09-24 19:02:30 +08:00
Wangyizhi1
c3324cc101
fix ‘name already exist’ bug (#6327) 2021-09-24 15:44:40 +08:00
Wangyizhi1
bf8e9b5721
[UI] null pointer exception (#6325) 2021-09-24 15:44:02 +08:00
caishunfeng
35312fd498
[Fix-6304] [UI] Fix alert-plugin-instance and alert-group list error (#6308)
* [DS-6304][fix]query alert-plugin-instance list 404 and alert-group list show

* [DS-6304][fix]query alert-plugin-instance list 404 and alert-group list show

Co-authored-by: caishunfeng <534328519@qq.com>
2021-09-23 20:04:19 +08:00
Tandoy
b8ed7e6f2d
Fix the error of mandatory success and failure task (#6305)
close #6301
2021-09-23 14:26:15 +08:00
Devosend
22277517c5
[Fix-6228][UI] fix yarn queue dialog bug (#6264)
very good, thanks for your contribution
2021-09-22 11:06:15 +08:00
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
2021-09-18 17:28:03 +08:00
Wangyizhi1
070b280f56
fix api error in dependent task (#6238) 2021-09-17 15:29:15 +08:00
break60
6aafa81aff
fixBug('#6172') Dag node name value judgment error (#6175)
Co-authored-by: xiangcaibiao <caibiao.xiang@sinocare.com>
2021-09-16 21:10:59 +08:00
Wangyizhi1
14feda996d
Improve workflow lineage interaction (#6230) 2021-09-16 19:41:16 +08:00
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.
2021-09-16 09:45:44 +08:00
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
2021-09-15 23:33:03 +08:00
Wangyizhi1
b79630488d
convert process definition id to code (#6191) 2021-09-13 18:03:28 +08:00
Wangyizhi1
ca488fcfa6
copy configs from taskDefinition (#6179) 2021-09-13 14:47:26 +08:00
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
2021-09-10 20:12:34 +08:00
Wangyizhi1
cca48d0a92
[Feature][JsonSplit-api] Improve some dag/formModel features (#6144)
* Add the prev tasks selector

* fix CONDITIONS node bugs

* fix code smells
2021-09-09 20:36:39 +08:00
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
2021-09-08 16:44:07 +08:00
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>
2021-09-08 10:40:40 +08:00
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
2021-09-08 09:35:27 +08:00
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
2021-09-07 23:52:03 +08:00
Wangyizhi1
5d06702711
[Feature-5498][JsonSplit-api] add task status (#6119)
* Refresh task status

* add version drawer

* Fix missing log button
2021-09-07 20:38:13 +08:00