Commit Graph

2876 Commits

Author SHA1 Message Date
liwenhe1993
6f6554ab9c
Fix errors when running on win10 (#2842)
1. DS cant run bat script
2. DS cant run python script
3. DS cant run datax script
2020-05-29 15:48:56 +08:00
bao liang
68bc59765b
fix bug: send task result to master until success. (#2839)
* fix bug: send task result to master until success.

* fix bug: send task result to master until success.

* add sleep

* set null if send result failed

* set null if send result failed

Co-authored-by: baoliang <baoliang@analysys.com.cn>
2020-05-29 15:43:05 +08:00
dailidong
12dc18bbac
add maven Xmx to 5g 2020-05-29 11:03:34 +08:00
bao liang
d67436ffad
[bug fix] fix: The workflow is fault-tolerant and 2 task instances are generated (#2833)
* feature: add number configuration for master dispatch tasks

* fix bug(#2762) the master would be blocked when worker group not exists

* fix bug(#2762) the master would be blocked when worker group not exists

* fix ut

* fix ut

* fix bug(2781): cannot pause work flow when task state is "submit success"

* fix code smell

* add mysql other param blank judge

* test

* update comments

* update comments

* add ut

* fix bug: Restart the worker service again, the previously submitted successful tasks are not executed

* update comments

* add sleep

* add null point check

* fix bug:After the master is fault-tolerant, it cannot resume operation

* fix bug: do not failover the host is 'NULL' process

* fix bug:worker failover error.

Co-authored-by: baoliang <baoliang@analysys.com.cn>
2020-05-28 12:31:12 +08:00
xingchun-chen
f25069bf83
Merge pull request #2831 from break60/dev-1.3.0
Add tips for download workflow
2020-05-28 10:48:14 +08:00
break60
ce405ddf8f fix 2020-05-28 10:34:51 +08:00
break60
feb169e8d2 Add tips for download workflow 2020-05-28 10:28:02 +08:00
xingchun-chen
a405bbec5f
Merge pull request #2829 from break60/dev-1.3.0
Fix ORACLE service name value display
2020-05-27 17:58:12 +08:00
break60
198cf3d45a Fix ORACLE service name value display 2020-05-27 17:33:31 +08:00
xingchun-chen
fa9706f63a Merge pull request #2825 from Eights-Li/dev-1.3.0
when init workflow, the tenantId linked by the tenantId of login user
2020-05-27 16:52:31 +08:00
lgcareer
fadb69b181
When update the data source,the host and port show error (#2821)
* When update the data source,the host and port show error

* update DataSourceServiceTest

* update DataSourceServiceTest

* update DataSourceServiceTest
2020-05-27 15:51:58 +08:00
xingchun-chen
b1e8bec16e
Merge pull request #2826 from break60/dev-1.3.0
dag download does not refresh, modify the task instance operation wid…
2020-05-27 11:35:04 +08:00
bao liang
1caac70215
[bug fix]fix bug: After the master is fault-tolerant, it cannot resume operation (#2813)
* feature: add number configuration for master dispatch tasks

* fix bug(#2762) the master would be blocked when worker group not exists

* fix bug(#2762) the master would be blocked when worker group not exists

* fix ut

* fix ut

* fix bug(2781): cannot pause work flow when task state is "submit success"

* fix code smell

* add mysql other param blank judge

* test

* update comments

* update comments

* add ut

* fix bug: Restart the worker service again, the previously submitted successful tasks are not executed

* update comments

* add sleep

* add null point check

* fix bug:After the master is fault-tolerant, it cannot resume operation

* fix bug: do not failover the host is 'NULL' process

Co-authored-by: baoliang <baoliang@analysys.com.cn>
2020-05-27 11:33:10 +08:00
break60
e4a616c270 fix 2020-05-27 10:50:57 +08:00
break60
92b915edab dag download does not refresh, modify the task instance operation width value 2020-05-27 10:34:48 +08:00
yelli.hl@foxmail.com
2c6aa57ce9 when init workflow, the tenantId linked by the tenantId of user 2020-05-27 09:51:25 +08:00
xingchun-chen
ee02e55308
Merge pull request #2823 from break60/dev-1.3.0
Repair process definition bulk delete function
2020-05-27 09:26:27 +08:00
break60
1ba802cfff Repair process definition bulk delete function 2020-05-26 18:36:28 +08:00
xingchun-chen
44b473cc22
Merge pull request #2814 from break60/dev-1.3.0
Modify process group workerGroup value display and filter child node …
2020-05-26 11:35:50 +08:00
break60
d4ef2293df Modify process group workerGroup value display and filter child node duplicate values 2020-05-26 11:23:37 +08:00
lgcareer
5b633cf412
fix oracle connect failure (#2812)
* use method getJdbcUrl of parent

* Remove the incorrect print message
2020-05-25 19:46:39 +08:00
zhangchunyang
9994878005
Added instructions for ambari to add and remove Dolphin Schdumer components on nodes (#2806)
* delete unnecessary configuration items

* Added instructions for ambari to add and remove Dolphin Schdumer components on nodes

* Added instructions for ambari to add and remove Dolphin Schdumer components on nodes
2020-05-25 17:59:30 +08:00
qiaozhanwei
7eb7efbd34
compatible old version host not port delete log file (#2811)
* add LoggerServerTest UT

* add LoggerServerTest UT

* add LoggerServerTest UT
add RemoveTaskLogRequestCommandTest UT
add RemoveTaskLogResponseCommandTest

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* add not worker log and remove worker invalid property

* process definition json worker group convert #2794

* process definition json worker group convert #2794

* process definition json worker group convert #2794

* process definition json worker group convert #2794

* process definition json worker group convert #2794

* process definition json worker group convert #2794

* process definition json worker group convert #2794

* process definition json worker group convert #2794

* compatible old version host not port delete log file

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
2020-05-25 17:59:02 +08:00
qiaozhanwei
d0fbfeaf17
process definition json worker group convert #2794 (#2809)
* add LoggerServerTest UT

* add LoggerServerTest UT

* add LoggerServerTest UT
add RemoveTaskLogRequestCommandTest UT
add RemoveTaskLogResponseCommandTest

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* add not worker log and remove worker invalid property

* process definition json worker group convert #2794

* process definition json worker group convert #2794

* process definition json worker group convert #2794

* process definition json worker group convert #2794

* process definition json worker group convert #2794

* process definition json worker group convert #2794

* process definition json worker group convert #2794

* process definition json worker group convert #2794

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
2020-05-25 17:18:15 +08:00
lgcareer
470bd59db7
rename worker_group_id to worker_group and set the value of worker_group_name (#2801) 2020-05-25 10:18:01 +08:00
xingchun-chen
4f0b9b51df
Merge pull request #2793 from break60/dev-1.3.0
Modify startup parameter worker group value
2020-05-25 09:28:14 +08:00
break60
e4df4131f1 Merge branch 'dev-1.3.0' of https://github.com/apache/incubator-dolphinscheduler into dev-1.3.0 2020-05-25 09:11:15 +08:00
zhangchunyang
15504bdde0
delete unnecessary configuration items (#2803) 2020-05-23 15:20:46 +08:00
bao liang
3e297bfd2e
[BUG FIX]fix bug: Restart the worker service again, the previously submitted successful tasks are not executed bug (#2800)
* feature: add number configuration for master dispatch tasks

* fix bug(#2762) the master would be blocked when worker group not exists

* fix bug(#2762) the master would be blocked when worker group not exists

* fix ut

* fix ut

* fix bug(2781): cannot pause work flow when task state is "submit success"

* fix code smell

* add mysql other param blank judge

* test

* update comments

* update comments

* add ut

* fix bug: Restart the worker service again, the previously submitted successful tasks are not executed

* update comments

* add sleep

Co-authored-by: baoliang <baoliang@analysys.com.cn>
2020-05-22 19:08:01 +08:00
qiaozhanwei
0130da2bdf
Fix [Bug] process definition json worker group convert #2794 (#2795)
* add LoggerServerTest UT

* add LoggerServerTest UT

* add LoggerServerTest UT
add RemoveTaskLogRequestCommandTest UT
add RemoveTaskLogResponseCommandTest

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* add not worker log and remove worker invalid property

* process definition json worker group convert #2794

* process definition json worker group convert #2794

* process definition json worker group convert #2794

* process definition json worker group convert #2794

* process definition json worker group convert #2794

* process definition json worker group convert #2794

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
2020-05-22 18:46:05 +08:00
break60
d8d9e83499 Merge branch 'dailidong-patch-1-1' of https://github.com/apache/incubator-dolphinscheduler into dev-1.3.0 2020-05-22 13:48:19 +08:00
break60
06ce6fbf51 Modify startup parameter worker group value 2020-05-22 11:58:47 +08:00
break60
0355dfc42a Merge branch 'dev-1.3.0' of https://github.com/apache/incubator-dolphinscheduler into dev-1.3.0 2020-05-22 11:22:40 +08:00
tlhhup
396b1716e4
fix bug:#2735 (#2770)
1. store process id in zk.
2. resolve host and port through zk path.
3. modify ui key.
2020-05-22 11:20:54 +08:00
bao liang
3d857bba92
[BUG FIX] fix bug:cannot pause work flow when task state is "submit success" (#2783)
* feature: add number configuration for master dispatch tasks

* fix bug(#2762) the master would be blocked when worker group not exists

* fix bug(#2762) the master would be blocked when worker group not exists

* fix ut

* fix ut

* fix bug(2781): cannot pause work flow when task state is "submit success"

* fix code smell

* add mysql other param blank judge

* test

* update comments

* update comments

* add ut

Co-authored-by: baoliang <baoliang@analysys.com.cn>
2020-05-22 10:42:24 +08:00
zhangchunyang
8951b29880
fixed #2788 resolve the bug #2788 (#2789)
* Modify the ambari-plugin readme for packing RPM packages and add a description of the replication plug-in directory

* fixed #2788
2020-05-22 10:39:42 +08:00
break60
354439f67b Merge branch 'dev-1.3.0' of https://github.com/apache/incubator-dolphinscheduler into dev-1.3.0 2020-05-22 09:27:48 +08:00
zhangchunyang
cada877079
Modify the ambari-plugin readme for packing RPM packages and add a description of the replication plug-in directory (#2786) 2020-05-21 19:09:11 +08:00
qiaozhanwei
51df429a80
add not worker log and remove worker invalid property (#2784)
* add LoggerServerTest UT

* add LoggerServerTest UT

* add LoggerServerTest UT
add RemoveTaskLogRequestCommandTest UT
add RemoveTaskLogResponseCommandTest

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* master select worker filter high load worker #2704

* add not worker log and remove worker invalid property

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
2020-05-21 19:01:01 +08:00
break60
05a0d3892a
Worker group adds check (#2787)
* Worker group adds check

* fix
2020-05-21 18:55:57 +08:00
break60
e83237f37e fix 2020-05-21 18:31:35 +08:00
break60
e94b02f279 Worker group adds check 2020-05-21 17:49:37 +08:00
zixi0825
6d0375e46d
fix sql task bug #2739 (#2741)
* Solve the failure to execute non-query sql

* fix sql task bug

Co-authored-by: sunchaohe <sunzhaohe@linklogis.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: lgcareer <18610854716@163.com>
2020-05-21 16:09:36 +08:00
xuchangqun
cfd83235a2
Hourly dependency configuration, 'currentHour' and 'last24Hours' (#2696)
* [feature] Add hourly dependency scenarios

* [Feature] #2680

add DependentUtilsTest UT

Co-authored-by: changqun.xu <changqun.xu@17zuoye.com>
Co-authored-by: xuchangqun <changqun.x@gmail.com>
2020-05-21 14:28:10 +08:00
bao liang
184d64e852
[BUG FIX] fix bug: dependent task failed when conditions task exists (#2768)
* fix bug 2464: change dependent task for process.

* remove unused code

* add ut

* add ut

* update comments

Co-authored-by: baoliang <baoliang@analysys.com.cn>
2020-05-21 10:34:28 +08:00
bao liang
7a05c007b4
[BUF FIX]fix: the master would be blocked when worker group not exists (#2764)
* feature: add number configuration for master dispatch tasks

* fix bug(#2762) the master would be blocked when worker group not exists

* fix bug(#2762) the master would be blocked when worker group not exists

* fix ut

* fix ut

Co-authored-by: baoliang <baoliang@analysys.com.cn>
2020-05-21 10:34:14 +08:00
xingchun-chen
7d2441f634
Merge pull request #2776 from break60/dev-1.3.0
Modify the background color of conditions task node connection
2020-05-21 10:13:16 +08:00
break60
9bdd36d8c4 Modify the background color of conditions task node connection 2020-05-21 09:43:46 +08:00
xingchun-chen
6550d3871e
Merge pull request #2765 from break60/dev-1.3.0
delete normalize
2020-05-21 09:30:04 +08:00
break60
170c7e63b9 Merge branch 'dev-1.3.0' of https://github.com/apache/incubator-dolphinscheduler into dev-1.3.0 2020-05-21 09:15:17 +08:00