Commit Graph

2781 Commits

Author SHA1 Message Date
张世鸣
e386af700d Using Jackson instead of Fastjson 2020-06-02 17:22:39 +08:00
张世鸣
a9f72c2081 Using Jackson instead of Fastjson 2020-06-02 15:54:34 +08:00
Han Gao
8f8ddae030
Using Jackson instead of Fastjson (#2850)
* Using Jackson instead of Fastjson

* Fix some json bugs

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-05-31 18:11:10 +08:00
CalvinKirs
c8ab27acb0
Optimization of enumerated values method (#2677)
* The value method of enum is a deep copy. If there are many parameters, it is not recommended to use the value method. Specifically see jmh results

* beautiful misunderstanding

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-05-31 10:29:46 +08:00
itbasketplayer
1513aae3ce
add job history to judge application status/2625 (#2848)
* job history status url when application number threshold is reached(default 10000,maybe it was set to 1000)

* job history status url when application number threshold is reached(default 10000,maybe it was set to 1000)

* job history status url when application number threshold is reached(default 10000,maybe it was set to 1000)

Co-authored-by: yuhaibin@lizhi.fm <35716fc5847f6d154cf556296453ca91>
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-05-30 23:07:17 +08:00
GabrielWithTina
d00627ff77
Return ProcessDefinition ID when call ProcessController.createProject. (#2849)
Return Scheduler ID when call SchedulerController.createScheduler.

client need the created object ID to bind the relationship between client system and Dolphinscheduler system.
2020-05-30 17:07:22 +08:00
如梦技术
1c15345442
fix: Improve the security of datasource management (#2844)
Closes 2638

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-05-30 15:03:10 +08:00
Wuv1Up
fbb8ff438a
fix return value of created project (#2804)
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-05-30 12:45:39 +08:00
xingchun-chen
e89f543f04
Merge pull request #2780 from BoYiZhang/dev
Sync file name
2020-05-21 10:53:39 +08:00
BoYiZhang
cfe8ef6295
Merge pull request #10 from apache/dev
update e2e chrome version (#2778)
2020-05-21 10:32:10 +08:00
xingchun-chen
714ad5d445
update e2e chrome version (#2778)
* 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

* update e2e chrome version

Co-authored-by: chenxingchun <438044805@qq.com>
2020-05-21 10:22:47 +08:00
BoYiZhang
20007264b1 Sync file name 2020-05-21 09:45:50 +08:00
BoYiZhang
72408b26b9
Merge pull request #9 from apache/dev
update code
2020-05-21 09:37:46 +08:00
gabry.wu
1a78c1150c
simply NettyExecutorManager.execute logic making it readable (#2744)
* simply NettyExecutorManager.execute logic making it readable

* fix NPE

* remove unused import

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-05-19 19:49:39 +08:00
gabry.wu
772a8e2b37
add retryCallSilent to RetryerUtils making it easy to use (#2729)
* add retryCallSilent to RetryerUtils making it easy to use

* add more detail to java doc of retryCallSilent
2020-05-19 10:18:21 +08:00
gabry.wu
1771aa50d5
change variable name ,make it easy to understand (#2647)
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-05-14 19:24:49 +08:00
CalvinKirs
0226f9f97e
Deprecated method changes (#2706)
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-05-14 19:06:46 +08:00
gabry.wu
c28a697ee8
add RetryerUtils to retry async & sync function gracefully (#2697)
* add RetryerUtils tool class for async & sync retry invoking

* add RetryerUtils tool class for async & sync retry invoking

* add guava-retrying-2.0.0.jar to known-dependencies.txt

* fix javadoc

* fix code smell

Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
2020-05-14 17:51:50 +08:00
liwenhe1993
e4ee7d1deb
Merge pull request #2707 from khadgarmage/fix-e2e-docker
fix e2e zk download failed
2020-05-14 16:48:22 +08:00
xiaochun.liu
4024465465 fix , 2020-05-14 16:23:07 +08:00
BoYiZhang
b9f7da80e5
Merge pull request #8 from apache/dev
update code
2020-05-14 13:52:13 +08:00
qiaozhanwei
459e40bf19
Merge branch 'dev' into fix-e2e-docker 2020-05-14 11:22:47 +08:00
xiaozhaoying
de3a81cab5
support ali nail(ding talk) , issue:2458 (#2594)
* Create TextMessage.java

* Create DingTalkUtils.java

* Update alert.properties

* Update Constants.java

* Update Constants.java

* Create DingTalkMsgFormatter.java

* Update alert.properties

* Create DingTalkMsgFormatterTest.java

* Create DingTalkUtilsTest.java

* Update DingTalkUtils.java

* Create DingTalkManager.java

* Update EmailAlertPlugin.java

* feature: test send msg with proxy

* fix:delete comment and add exception info

* Update DingTalkUtilsTest.java

* Update DingTalkUtils.java

* Update DingTalkManager.java

* Update EmailAlertPlugin.java

* Update DingTalkUtilsTest.java

* Update DingTalkMsgFormatter.java

* Update DingTalkUtils.java

* Update DingTalkMsgFormatterTest.java

* Update DingTalkUtilsTest.java

* Update TextMessage.java

* Update DingTalkManager.java

* Delete TextMessage.java

* fix: add test case

* fix:add http client test case

* fix:delete ignore test case

* Update pom.xml

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-05-14 10:18:22 +08:00
xiaochun.liu
91c544f24f sql 2020-05-14 00:04:52 +08:00
xiaochun.liu
c68785632f merge from dev-1.3.0 2020-05-13 23:31:36 +08:00
BoYiZhang
b28b4adfa0
Merge pull request #7 from apache/dev
update code
2020-05-12 09:45:54 +08:00
JinyLeeChina
daea87a515
'ExecutionStatus' (#2635)
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
2020-05-11 14:43:49 +08:00
Rubik-W
68e3487e34
feature: Add user state #1923 (#2424)
* feature: #1923

* fix:docker sql script add column

* fix: update sql script

* fix: UT bug

* fix: UT bug

* fix: UT bug

* fix: e2e UT bug

* fix: e2e button location

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-05-11 11:45:29 +08:00
s751167520
cb5285384e
Fix some code specification issues (#2482)
* Fix some code specification issues

* Pre-compile regular expressions to improve efficiency and solve concurrency problems

* Solve the nullpoint problem that Object.equals may bring

* Modify if else structure, add {} to improve code readability

Co-Authored-By: daili <daili@users.noreply.github.com>

* Update ResourceTreeVisitor.java

re-run test process

Co-authored-by: daili <daili@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-05-10 23:05:12 +08:00
xingchun-chen
a5b0536437
modify soft_version 1.2.2 to 1.3.0 (#2642)
Co-authored-by: chenxingchun <438044805@qq.com>
2020-05-08 18:49:43 +08:00
dailidong
8493aa8209
simplify common config (#2613)
* 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

* simplify common config

Co-authored-by: lidongdai <escheduler@outlook.com>
Co-authored-by: dailidong <dolphinschedule@gmail.com>
2020-05-08 16:08:08 +08:00
qiaozhanwei
bb52671fee
Worker Group display #2627 (#2630)
* 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

* No master don't create command #2571

* Worker Group display #2627

* Worker Group display #2627

* Worker Group display #2627

* Worker Group display #2627

* Worker Group display #2627

* Worker Group display #2627

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
2020-05-08 15:43:11 +08:00
ywywn
8c8e128d18
fix code annotation error(#2603) (#2614) 2020-05-08 15:23:31 +08:00
xingchun-chen
8e080ef608
Merge pull request #2633 from break60/dev
Fix data loading on file management detail page
2020-05-08 13:42:17 +08:00
break60
f75874bc17 Fix data loading on file management detail page 2020-05-08 13:27:36 +08:00
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