Commit Graph

2639 Commits

Author SHA1 Message Date
kezhenxu94
91f64a1afa
Merge branch 'dev' into issue/1463 2020-05-02 22:51:18 +08:00
kezhenxu94
6e08b29254
Add a script to check the license (#2552)
* Add a script to check the license

### Motivation

Check licenses in the distribution package

### Modification

1. Add a script to check licenses, and list known licenses.
1. Remove unused dep license, lombok.
1. Remove unnecessary ignored patterns in .gitignore.
1. Add missing config items to apache-rat plugin, which just checked a small part of files before.
1. Add check to GitHub Actions process

### Result

1. Newly-added dependencies should be checked and confirmed.
1. Closes #1578

* Separate rat and dependency check

* Tee dependencies to stdout

* Add more debug messages

* Check light-weight task first
2020-05-02 22:19:20 +08:00
kezhenxu94
64f1de8dbb
Merge branch 'dev' into issue/1463 2020-04-30 23:08:27 +08:00
liwenhe1993
6e81dd3b58
Merge pull request #2572 from hgaol/dev
feat: add plugin management for alert service
2020-04-30 22:46:15 +08:00
liwenhe1993
eefea82487
Merge branch 'dev' into dev 2020-04-30 22:25:08 +08:00
kezhenxu94
e9b8c73dce
Merge branch 'dev' into issue/1463 2020-04-30 19:39:50 +08:00
zhangchunyang
ad90df2057
1. add file add README.md2. delete ambari_plugin/common-services/DOLPHIN/2.0.0 (#2546)
* Ambari plugin development for the dolphin scheduler in version 2.0.0 is complete

* Update the Ambari plugin of DS  usage documentation

* delete readme whic is not completed

* update version 2.0.0 backup to 1.3.0

* update ambari plugin version to 1.3.0

* add readme doc

* delete common-services/DOLPHIN/2.0.0

* update the version in doc

Co-authored-by: zhangchunyang <zhangchunyang@analysys.com.cn>
Co-authored-by: zhangchunyang <18910529250@163.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-04-30 19:36:08 +08:00
kezhenxu94
45d58cd984
Exclude i18n files from code analysis 2020-04-30 19:35:08 +08:00
kezhenxu94
0656337499
Merge branch 'dev' into issue/1463 2020-04-30 19:22:29 +08:00
hgaol
906ffa09a9 resolve code checks 2020-04-30 15:35:18 +08:00
hgaol
3c6d813617 add license to plugin api pom file 2020-04-30 15:35:18 +08:00
hgaol
85f3ac10a0 feat: add plugin management for alert service 2020-04-30 15:35:18 +08:00
xingchun-chen
d629d38574
Merge pull request #2586 from break60/dev
Work example page list supports scrolling #2554
2020-04-30 15:27:10 +08:00
break60
6e7b11bd04 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-30 15:10:58 +08:00
xingchun-chen
a5e4566ed1
Merge pull request #2556 from muzhongjiang/dev
fix bug "Password display in plain text"(修复密码明文显示问题)
2020-04-30 15:10:11 +08:00
xingchun-chen
54fc147951
Merge branch 'dev' into dev 2020-04-30 14:58:14 +08:00
kezhenxu94
534c8f7cd3
Retrigger 2020-04-30 11:44:58 +08:00
break60
9197a68610 Work example page list supports scrolling 2020-04-30 11:31:00 +08:00
kezhenxu94
8d902700bd
Merge branch 'dev' into issue/1463 2020-04-30 11:30:34 +08:00
xingchun-chen
c94748a615
Merge pull request #2582 from break60/dev
Fix condition judgment state value #2557
2020-04-30 11:20:19 +08:00
break60
16a4d59085 fix 2020-04-30 10:53:02 +08:00
break60
049470311a Fix condition judgment state value 2020-04-30 09:25:53 +08:00
kezhenxu94
234d6b609a
Add license header to eslint 2020-04-30 00:04:43 +08:00
kezhenxu94
ba8492f428
Reorder lint action 2020-04-30 00:01:57 +08:00
kezhenxu94
519e8c22ef
Add eslint to check frontend codes style, closes #1463 2020-04-29 23:59:30 +08:00
dailidong
682fd7beea
Merge branch 'dev' into dev 2020-04-29 19:49:11 +08:00
xingchun-chen
22d4ee942c
modify dataX environment variable (#2577)
* 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

* modify dataX environment variable

Co-authored-by: chenxingchun <438044805@qq.com>
2020-04-29 18:29:50 +08:00
qiaozhanwei
5666e6b75a
No master don't create command #2571 (#2575)
* 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

* No master don't create command #2571

* No master don't create command #2571

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
2020-04-29 17:36:21 +08:00
dailidong
5caa6e5d9d
Merge branch 'dev' into dev 2020-04-28 23:11:07 +08:00
qiaozhanwei
a12103b08c
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>
2020-04-28 18:39:53 +08:00
xingchun-chen
7a100086b7
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>
2020-04-28 17:57:30 +08:00
mzjnumber1@163.com
bbc1e53c82 Merge branch 'dev' of github.com:muzhongjiang/incubator-dolphinscheduler into dev 2020-04-28 17:32:50 +08:00
mzjnumber1@163.com
336a7f346c Merge remote-tracking branch 'remote/dev' into dev 2020-04-28 17:31:39 +08:00
mzjnumber1@163.com
9421a79457 fix bug "Password display in plain text" 2020-04-28 17:31:14 +08:00
lgcareer
fd79be39a9
verify whether the filename start with '/' (#2544)
* fix #2442 when the resource name contains '$',need translate it to '\$'

* fix #2442 when the resource name contains '$',need translate it to '/$'

* verify whether the filename start with '/'

Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-04-28 11:23:28 +08:00
xingchun-chen
062a0ffbf3
Merge pull request #2549 from break60/dev
Fix page display incomplete
2020-04-28 11:11:06 +08:00
break60
76b61c1542 Fix page display incomplete 2020-04-28 10:57:54 +08:00
liwenhe1993
4f9d8caeed
Use docker-compose for deployment . Failed to execute python script (#2539)
* Modify docker-compose and dockerfile

1. Add python3 in Dockerfile
2. Modify startup.sh file
3. Modify docker-compose.yml and add docker-stack.yml
4. Modify dolphinscheduler_env.sh

* Add logback-xx.xml and Modify Dockerfile
2020-04-27 16:18:21 +08:00
lgcareer
e6dec8d2a7
fix #2442 when the resource name contains '$',need translate it to '\$' (#2524)
* fix #2442 when the resource name contains '$',need translate it to '\$'

* fix #2442 when the resource name contains '$',need translate it to '/$'

Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-04-27 14:16:21 +08:00
t1mon
c50ad1240c
Add query result set limit. (#2459)
* Optimize PropertyUtils instantiation.

* Fix info error.

* Add query result set limit.

* fix code smell

Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
2020-04-27 10:23:29 +08:00
liwenhe1993
e13c08d04f
Merge pull request #2522 from liwenhe1993/docker-compose-dev
Running the docker cluster of dolphinscheduler by docker-compse
2020-04-26 21:34:32 +08:00
qiaozhanwei
f38e076d18
Merge branch 'dev' into docker-compose-dev 2020-04-26 18:51:46 +08:00
zhangchunyang
1185cdafb6
update version 2.0.0 backup to 1.3.0 (#2531)
* Ambari plugin development for the dolphin scheduler in version 2.0.0 is complete

* Update the Ambari plugin of DS  usage documentation

* delete readme whic is not completed

* update version 2.0.0 backup to 1.3.0

* update ambari plugin version to 1.3.0

Co-authored-by: zhangchunyang <zhangchunyang@analysys.com.cn>
Co-authored-by: zhangchunyang <18910529250@163.com>
2020-04-26 18:50:38 +08:00
qiaozhanwei
7aab801669
Merge branch 'dev' into docker-compose-dev 2020-04-26 18:37:15 +08:00
qiaozhanwei
9f32f2db66
#2499 bug fix (#2527)
* 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

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
2020-04-26 15:58:05 +08:00
liwenhe1993
7eecfe45ea Modify docker-compose and kubernetes config
1. Move kubernetes to docker directory
2. Change docker-compose directory's name, and move docker-compose to docker directory
3. Modify docker-compose config and kubernetes config
4. Modify startup.sh in dockerfile
2020-04-26 14:13:07 +08:00
liwenhe1993
f1d8c15148 Add docker-compose.yml 2020-04-26 10:30:44 +08:00
qiaozhanwei
db7c0cbd8c
#2499 buf fix (#2518)
* 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

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
2020-04-24 16:51:16 +08:00
xingchun-chen
f08e62fa84
Merge pull request #2516 from break60/dev
Echo of worker grouping when the workflow is running
2020-04-24 15:58:44 +08:00
break60
a404b19692 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-24 15:47:09 +08:00