Commit Graph

2837 Commits

Author SHA1 Message Date
743294668
30d57f304a
Fix notes (#2615)
Co-authored-by: taoyuxin <taoyuxin@inspur.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: Tboy <guo.jiwei@immomo.com>
2020-05-08 11:27:29 +08:00
xingchun-chen
edc7235328
Merge pull request #2626 from break60/dev
Fix worker grouping
2020-05-08 09:48:28 +08:00
break60
89c0fc2aae Fix worker grouping 2020-05-08 09:34:55 +08:00
xingchun-chen
7477f9c96a
Merge pull request #2622 from break60/dev
Fix worker grouping
2020-05-08 09:32:25 +08:00
break60
cff7b8884a fix 2020-05-08 09:20:18 +08:00
break60
8313c70235 fix 2020-05-08 09:06:37 +08:00
break60
9b381a79b2 fix 2020-05-07 21:52:19 +08:00
break60
e8edd49e5c fix 2020-05-07 21:51:01 +08:00
break60
dce89249e3 fix 2020-05-07 21:28:15 +08:00
break60
561c6c88f5 fix 2020-05-07 21:13:16 +08:00
break60
8854b36561 fix 2020-05-07 20:42:56 +08:00
break60
933c5fee84 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-05-07 17:33:20 +08:00
break60
21fa3148e4 Fix worker grouping 2020-05-07 17:33:04 +08:00
xingchun-chen
6127f3a460
Merge pull request #2617 from simon824/dev
unique check before import ProcessDefinitions
2020-05-07 17:18:42 +08:00
xingchun-chen
db772438a2
Merge branch 'dev' into dev 2020-05-07 17:07:18 +08:00
xingchun-chen
33658d57fd
Merge pull request #2621 from break60/dev
Fix creating user selection box width
2020-05-07 17:07:02 +08:00
xingchun-chen
59c9649f1d
Merge branch 'dev' into dev 2020-05-07 16:57:08 +08:00
break60
51d7455f57 Fix creating user selection box width 2020-05-07 16:49:31 +08:00
xingchun-chen
56aec7c90d
Merge pull request #2618 from samz406/57
modify the prompt message when the user does not select the queue
2020-05-07 16:36:00 +08:00
samz406
d20e1f95e1 Modify the prompt message when the user does not select the queue 2020-05-07 16:08:28 +08:00
张世鸣
ec2509fc46 unique check before import ProcessDefinitions 2020-05-07 15:36:51 +08:00
samz406
6962492c47
Merge pull request #10 from apache/dev
update
2020-05-07 14:29:21 +08:00
Simon
badc05c916
Merge pull request #11 from apache/dev
update
2020-05-07 14:04:20 +08:00
张世鸣
9395abb155 unique check before import ProcessDefinitions 2020-05-07 12:52:28 +08:00
xingchun-chen
697ea0f656
Merge pull request #2558 from samz406/dev
fix The create user is always loading when the queue does not select any value
2020-05-07 11:51:42 +08:00
xingchun-chen
b7e3dd487c
Merge branch 'dev' into dev 2020-05-07 11:38:55 +08:00
xingchun-chen
632b2b503a
Merge pull request #2573 from simon824/dev
update mysql config
2020-05-07 09:48:05 +08:00
xingchun-chen
7a483736f7
Merge branch 'dev' into dev 2020-05-07 09:36:06 +08:00
xingchun-chen
b5dbe94f07
Merge pull request #2610 from break60/dev
Fix querying all packet interfaces when the workflow is running
2020-05-07 09:35:28 +08:00
break60
4dcf85e2d2 Merge branch 'dev' of https://github.com/break60/incubator-dolphinscheduler into dev 2020-05-07 09:19:49 +08:00
break60
689bb5a278 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-05-07 09:19:21 +08:00
xingchun-chen
3b47e15cf8
Merge branch 'dev' into dev 2020-05-07 09:16:00 +08:00
xingchun-chen
32c5a68a71
Merge pull request #2580 from kezhenxu94/issue/1463
Add eslint to check frontend codes style, closes #1463
2020-05-07 09:14:51 +08:00
break60
4d70e3ce91 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-05-07 08:56:07 +08:00
kezhenxu94
de5c619948
Merge branch 'dev' into issue/1463 2020-05-06 22:29:05 +08:00
zixi0825
fadfb28187
fix copy workflow tip (#2612)
Co-authored-by: sunchaohe <sunzhaohe@linklogis.com>
2020-05-06 21:33:08 +08:00
kezhenxu94
5fdfadda5b
Merge branch 'dev' into issue/1463 2020-05-06 19:43:27 +08:00
张世鸣
97d09e1d6a init 2020-05-06 19:38:34 +08:00
张世鸣
82fee46d70 unique check before import ProcessDefinitions 2020-05-06 19:31:56 +08:00
Simon
ebe3920f0b
Merge pull request #10 from apache/dev
a
2020-05-06 19:19:57 +08:00
dailidong
6a92bef5e3
add development state config (#2609)
* update README about DolphinScheduler

* Update issue templates

* update

* regularize api pom xml
update rpc maven compile to 1.8

* regularize api pom xml

* change commons.lang3.StringUtils to common.utils.StringUtils

* update pom.xml

* update

* correct equals method

* jasper-runtime is needed when api server start

* jasper-runtime jar is needed when api server start

* combine logback config of master/worker/alert/api server to one logback.xml

* remove tomcat runtime jar

* add UT

* add license

* remove jasper-runtime jar, not need anymore

* sovle jar conflict, remove servlet-api 2.5 jar

* remove servlet 2.5

* add embedded database h2 and update embedded zookeeper

* delete logs

* add license

* change log level to INFO

* simplify and optimize config

* add development state

Co-authored-by: lidongdai <escheduler@outlook.com>
Co-authored-by: dailidong <dolphinschedule@gmail.com>
2020-05-06 18:38:19 +08:00
kezhenxu94
f84f6ce6b3
Merge branch 'dev' into issue/1463 2020-05-06 18:25:29 +08:00
break60
c49825db03 Fix querying all packet interfaces when the workflow is running 2020-05-06 18:03:46 +08:00
xingchun-chen
85d4f03dd3
Merge pull request #2606 from break60/dev
Workflow list style optimization
2020-05-06 17:20:29 +08:00
break60
88e4356edf Merge branch 'dev' of https://github.com/break60/incubator-dolphinscheduler into dev 2020-05-06 17:03:53 +08:00
xingchun-chen
bc7a3f9647
Merge branch 'dev' into dev 2020-05-06 17:03:47 +08:00
break60
8cf83cd4ed Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-05-06 17:03:36 +08:00
kezhenxu94
26ec4745cd
Merge branch 'dev' into issue/1463 2020-05-06 16:34:58 +08:00
zixi0825
b08ba3461e
process batch export and import #2501 (#2560)
* Increase dataX environment variable, sslTrust default value (#2555)

* add LoginTest license

* Delete useless packages

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* Update worker_group_id to worker_group in init.sql

* Update worker_group_id to worker_group in init.sql

* Update worker_group_id to worker_group

* Increase dataX environment variable, sslTrust default value

Co-authored-by: chenxingchun <438044805@qq.com>

* no valid worker group,master can kill task directly (#2541)

* dispatch task fail will set task status failed

* 1,no worker condition , master will while ture wait for worker startup
2,worker response task status sync wait for result

* 1,no worker condition , master will while ture wait for worker startup
2,worker response task status sync wait for result

* 1,no worker condition , master will while ture wait for worker startup
2,worker response task status sync wait for result

* 1,no worker condition , master will while ture wait for worker startup
2,worker response task status sync wait for result

* 1,no worker condition , master will while ture wait for worker startup
2,worker response task status sync wait for result

* 1,no worker condition , master will while ture wait for worker startup
2,worker response task status sync wait for result

* 1,no worker condition , master will while ture wait for worker startup
2,worker response task status sync wait for result

* 1,no worker condition , master will while ture wait for worker startup
2,worker response task status sync wait for result

* 1,no worker condition , master will while ture wait for worker startup
2,worker response task status sync wait for result

* 1,no worker condition , master will while ture wait for worker startup
2,worker response task status sync wait for result

* 1,no worker condition , master will while ture wait for worker startup
2,worker response task status sync wait for result

* 1,task status statistics and process status statistics bug fix (#2357)
2,worker group bug fix

* 1,task status statistics and process status statistics bug fix (#2357)
2,worker group bug fix

* 1,task status statistics and process status statistics bug fix (#2357)
2,worker group bug fix

* 1,task status statistics and process status statistics bug fix (#2357)
2,worker group bug fix

* send mail error, #2466 bug fix

* send mail error, #2466 bug fix

* send mail error, #2466 bug fix

* send mail error, #2466 bug fix

* #2486 bug fix

* host and workergroup compatible

* EnterpriseWeChatUtils modify

* EnterpriseWeChatUtils modify

* EnterpriseWeChatUtils modify

* #2499 bug fix

* add comment

* revert comment

* revert comment

* #2499 buf fix

* #2499 bug fix

* #2499 bug fix

* #2499 bug fix

* #2499 bug fix

* #2499 bug fix

* #2499 bug fix

* no valid worker group,master can kill task directly

* no valid worker group,master can kill task directly

* no valid worker group,master can kill task directly

* no valid worker group,master can kill task directly

* no valid worker group,master can kill task directly

* no valid worker group,master can kill task directly

* no valid worker group,master can kill task directly

* no valid worker group,master can kill task directly

* no valid worker group,master can kill task directly

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>

* add batch import and export process definition

* fix unit test bug

* add unit test

* add unit test 2

* fix duplicated code problem

* fix duplicated code problem 2

* fix duplicated code problem 3

* fix duplicated code problem 4

* fix the vulnerability bug

* fix the vulnerability bug

* fix the code smells

* fix the code smells 1

* fix the code smells 2

* fix the code smells 3

Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
Co-authored-by: chenxingchun <438044805@qq.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: sunchaohe <sunzhaohe@linklogis.com>
2020-05-06 16:33:45 +08:00
break60
8fed430cd1 Workflow list style optimization 2020-05-06 16:21:25 +08:00