test/DolphinScheduler
1
0
Fork 0
mirror of https://gitee.com/dolphinscheduler/DolphinScheduler.git synced 2024-12-04 21:28:00 +08:00
Code Issues Actions 10 Packages Projects Releases Wiki Activity
2,639 Commits 27 Branches 59 Tags 276 MiB
91f64a1afa
Commit Graph

2639 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
liwenhe1993
30137d7761 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-22 09:48:19 +08:00
break60
89a58173a2 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-22 09:05:06 +08:00
oceanos
85385e10eb Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-21 19:32:53 +08:00
qiaozhanwei
54fc32e207
#2486 bug fix (#2487) 
* 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

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
 2020-04-21 18:52:07 +08:00
break60
298f736a31 delete img 2020-04-21 18:20:32 +08:00
break60
85ea614ccb Merge branch 'refactor-worker' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-21 18:11:58 +08:00
break60
3aa7fe2844 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-21 16:48:05 +08:00
qiaozhanwei
28766df53f
send mail error, #2466 bug fix (#2470) 
* 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

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
 2020-04-21 14:40:19 +08:00
break60
6eda6805c6 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-21 11:31:51 +08:00
zhangchunyang
f3dc1c94ba
resolve #2474 (#2477) 
* In the dev branch, in order to the RPM package which is printed under the dist module contain configuration files: master.properties, worker.properties

* Restore files deleted by mistake

Co-authored-by: zhangchunyang <zhangchunyang@analysys.com.cn>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
 2020-04-21 11:08:04 +08:00
break60
d9e1487e81 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-21 10:48:51 +08:00
break60
3740b2410e
Modify worker parameters (#2479) 
* Fix the problem of data echo in script edit box

* Optimize resource tree

* Change the name of the shell node and modify the parameter transmission method of spark, mr, python, and flink nodes

* Repair naming

* Modify list style

* Online editing is prohibited

* Change the background color of the disabled state of the radio button when the workflow goes online

* Modify worker parameters

Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
 2020-04-21 10:48:32 +08:00
break60
e87043a3dd Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-21 10:26:29 +08:00
dailidong
eec92ed1fc
simplify and optimize config (#2469) 
* [Refactor worker] simplify and optimize config (#2386)

* simplify config

* simplify config

* simplify and optimize config

* Update HadoopUtils.java

optimize HadoopUtils

* Update HadoopUtilsTest.java

* Update HadoopUtilsTest.java

* Update HadoopUtilsTest.java

* Update HttpUtils.java

* Update pom.xml

* Update HadoopUtilsTest.java

* Update HadoopUtilsTest.java

* Update HadoopUtilsTest.java

* Update HadoopUtilsTest.java

* Update HadoopUtilsTest.java

* Update HadoopUtilsTest.java
 2020-04-21 02:25:45 +00:00
break60
a358b58ef8 Modify worker parameters 2020-04-21 09:40:15 +08:00
break60
d23e3b5ee6 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-21 08:52:04 +08:00
dailidong
a989e60558
Update HadoopUtilsTest.java 2020-04-21 00:12:25 +08:00
dailidong
ee34a95f3d
Update HadoopUtilsTest.java 2020-04-20 23:46:36 +08:00
dailidong
5b2303c7e3
Update HadoopUtilsTest.java 2020-04-20 20:08:26 +08:00
dailidong
51bf150b94
Update HadoopUtilsTest.java 2020-04-20 20:07:41 +08:00
dailidong
037ab78aaf
Update HadoopUtilsTest.java 2020-04-20 19:44:34 +08:00
dailidong
176c637757
Update HadoopUtilsTest.java 2020-04-20 18:03:23 +08:00
dailidong
0b405b6fc8
Update pom.xml 2020-04-20 17:17:08 +08:00
dailidong
437605e665
Update HttpUtils.java 2020-04-20 16:54:08 +08:00
dailidong
c4d3329c0a
Merge branch 'dev' into refactor-worker 2020-04-20 16:14:32 +08:00
dailidong
dc36c77ba7
Update pom.xml (#2467) 2020-04-20 16:10:21 +08:00
dailidong
a8437f0f02
Update HadoopUtilsTest.java 2020-04-20 16:00:24 +08:00
dailidong
2d04e4748d
Merge branch 'dev' into refactor-worker 2020-04-20 15:23:57 +08:00
dailidong
0f54149ae3
exclude HadoopUtils Test (#2465) 
* Update pom.xml

* Update pom.xml
 2020-04-20 14:38:46 +08:00
break60
bc11bc7805 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-20 13:50:31 +08:00
break60
ef686811e5
Change the background color of the disabled state of the radio button when the workflow goes online #2451 (#2453) 
* Fix the problem of data echo in script edit box

* Optimize resource tree

* Change the name of the shell node and modify the parameter transmission method of spark, mr, python, and flink nodes

* Repair naming

* Modify list style

* Online editing is prohibited

* Change the background color of the disabled state of the radio button when the workflow goes online

Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
 2020-04-20 13:49:58 +08:00
break60
5ab41fe6ff Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-20 11:38:26 +08:00
bao liang
4946e88872
move dependent and conditions to master server (#2423) 
* move condition and dependent to master

* move conditions to master

* move conditions and dependent task to master

* move conditions to master

* update test

* add log

* add test for dependent task

* add test for dependent task

* update

* update

* refactor complexity code

* refactor complexity code

* add conditions task test

* add conditions task test

* update

* update host to host:port

* update logback.xml

Co-authored-by: baoliang <baoliang@analysys.com.cn>
 2020-04-20 11:31:15 +08:00
dailidong
844000184e
Merge branch 'dev' into refactor-worker 2020-04-20 10:34:55 +08:00
break60
dbe500280e Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-20 09:49:57 +08:00
zixi0825
ca66cfec17
solve code spell problem (#2419) 
* solve code spell problem

* remove controller test

* add controller test

* sovle spell problem and sovle conflict

* sovle spell problem and sovle conflict

* sovle spell problem and add test

Co-authored-by: sunchaohe <sunzhaohe@linklogis.com>
 2020-04-18 11:28:08 +08:00
dailidong
a563c82c6d
Update HadoopUtilsTest.java 2020-04-17 23:28:19 +08:00
dailidong
3c05ae8f20
Merge branch 'dev' into refactor-worker 2020-04-17 20:21:57 +08:00
break60
e0044260f8 Change the background color of the disabled state of the radio button when the workflow goes online 2020-04-17 17:44:28 +08:00
break60
1f486b2ab0 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-17 15:31:58 +08:00
xingchun-chen
c4f44a62b3
Merge pull request #2440 from Rubik-W/fixbug-#2439 
fix: Gantt chart bug #2439
 2020-04-17 14:00:12 +08:00
Rubik-W
e2775c0dbd
Merge branch 'dev' into fixbug-#2439 2020-04-17 12:14:06 +08:00
Han Gao
4769bce0d7
update controllers with ApiException annotation (#2401) 
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
 2020-04-17 11:49:43 +08:00
dailidong
8e7dcc02b2
Update HadoopUtilsTest.java 2020-04-17 11:42:54 +08:00
dailidong
fdff6f5278
Merge branch 'dev' into refactor-worker 2020-04-17 11:41:26 +08:00
break60
31e90d8727 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-17 11:10:03 +08:00
qiaozhanwei
5ccd742aec
Merge branch 'dev' into fixbug-#2439 2020-04-17 10:54:44 +08:00
break60
f5a8b56674
Online editing is prohibited (#2444) 
* Fix the problem of data echo in script edit box

* Optimize resource tree

* Change the name of the shell node and modify the parameter transmission method of spark, mr, python, and flink nodes

* Repair naming

* Modify list style

* Online editing is prohibited

Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
 2020-04-17 10:53:11 +08:00
oceanos
f01940a113 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-17 10:26:32 +08:00
break60
4bfe816e9d Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2020-04-17 10:23:33 +08:00