Commit Graph

2837 Commits

Author SHA1 Message Date
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
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
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
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
xingchun-chen
da533044a6
update e2e chrome version (#2775)
Co-authored-by: chenxingchun <438044805@qq.com>
2020-05-20 23:39:53 +08:00
break60
8c7bc82ed4 delete normalize 2020-05-20 11:49:35 +08:00
xingchun-chen
cf4fca1782
Merge pull request #2760 from break60/dev-1.3.0
Fix workflow definition history node data cannot be opened
2020-05-20 09:12:10 +08:00
break60
34c292b7db fix 2020-05-19 19:09:41 +08:00
break60
aa5e2cc49d Fix workflow definition history node data cannot be opened 2020-05-19 19:04:35 +08:00
Tboy
86f4276f0f
Fix MySQL autoDeserialize bug (#2728)
* Fix MySQL autoDeserialize bug

* add MySQLDataSourceTest
2020-05-19 18:48:58 +08:00
xingchun-chen
f03dc47b5c
Merge pull request #2756 from break60/dev-1.3.0
Fix rename check parameter
2020-05-19 17:06:15 +08:00
break60
448d9d2d35 Merge branch 'dev-1.3.0' of https://github.com/apache/incubator-dolphinscheduler into dev-1.3.0 2020-05-19 16:53:07 +08:00
lgcareer
911053ebfc
fix 2598:change getId to getUserId (#2757)
* fix #2598:allow to update resource suffix,but if it is authorized to other users,it is not allowed.

* add RESOURCE_IS_AUTHORIZED status

* verify whether the suffix is empty

* remove extra variables

* fix code smell

* change getId to getUserId
2020-05-19 16:42:26 +08:00
break60
0e6494567f fix 2020-05-19 16:30:03 +08:00
break60
7ef3bb24df Fix rename check parameter 2020-05-19 15:47:10 +08:00
qiaozhanwei
2330cc8872
master select worker filter high load worker #2704 (#2733)
* 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

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
2020-05-19 11:38:41 +08:00
dailidong
8cb4cd23ca
fix getWorkers bug on RunConfig (#2747)
* fix worker group config no effect

* remove codehaus janino jar
the license about janino maybe not compatiable with Apache v2

* Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0

# Conflicts:
#	dolphinscheduler-server/src/main/resources/config/install_config.conf

* datasource config

* Update datasource.properties

* fix RunConfig bug
2020-05-19 09:59:23 +08:00
dailidong
be3e761a9a
Update known-dependencies.txt (#2748) 2020-05-18 22:08:31 +08:00
bao liang
a9da86abb4
[bug fix] fix bug:2634:Process shows success,when the task of the process is killed in the terminal (#2731)
* fix bug: some bugs about worker group from 1.2.0 to 1.3.0

* fix bug: scheduler from 1.2.0 to 1.3.0 do not work

* fix bug: scheduler from 1.2.0 to 1.3.0 do not work

* fix ut bug

* fix bug: Process shows success,when the task of the process is killed in the termina

* fix bug #2634: Process shows success,when the task of the process is killed in the terminal

Co-authored-by: baoliang <baoliang@analysys.com.cn>
2020-05-18 18:27:16 +08:00
dailidong
9ffcd82447
remove codehaus janino jar (#2742)
the license about janino maybe not compatiable with Apache v2
2020-05-18 18:05:39 +08:00
dailidong
b51c999552
update worker group config (#2746)
* fix worker group config no effect

* remove codehaus janino jar
the license about janino maybe not compatiable with Apache v2

* Merge remote-tracking branch 'upstream/dev-1.3.0' into dev-1.3.0

# Conflicts:
#	dolphinscheduler-server/src/main/resources/config/install_config.conf

* Update datasource.properties
2020-05-18 18:04:24 +08:00
dailidong
2700f8d87e
Update known-dependencies.txt 2020-05-18 17:57:11 +08:00
lgcareer
60f8eb25fa
fix #2598::allow to update resource suffix,but if it is authorized to other users,it is not allowed (#2732)
* fix #2598:allow to update resource suffix,but if it is authorized to other users,it is not allowed.

* add RESOURCE_IS_AUTHORIZED status

* verify whether the suffix is empty

* remove extra variables

* fix code smell
2020-05-18 17:56:41 +08:00
dailidong
63ce143be5
set worker group (#2743)
* simple config

* fix worker group config no effect
2020-05-18 17:06:26 +08:00
xingchun-chen
ff1f5fe891
Merge pull request #2740 from break60/dev-1.3.0
Modify ip configuration
2020-05-18 16:32:37 +08:00
break60
d588d62620 Modify ip configuration 2020-05-18 16:16:04 +08:00
xingchun-chen
7010bb2ef2
Modify HDFS/S3 path (#2736)
* Modify HDFS/S3 path
 

* Modify HDFS/S3 path
 

* Update common.properties

Co-authored-by: chenxingchun <438044805@qq.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-05-18 15:35:11 +08:00
xingchun-chen
1c214faeab
Merge pull request #2737 from break60/dev-1.3.0
Underline the list of workflow operations
2020-05-18 15:17:06 +08:00
break60
af458a4524 Underline the list of workflow operations 2020-05-18 14:41:55 +08:00
lgcareer
f52bad5e8c
fix #2449:It's should successful to cancel authorize a resource of a user if all the online process definitions created by this user didn't use this resource. (#2725) 2020-05-18 11:05:12 +08:00
xingchun-chen
c08fa12f50
Merge pull request #2721 from break60/dev-1.3.0
Conditional judgment adds text
2020-05-15 18:02:23 +08:00
break60
78bd5797fa fix 2020-05-15 17:20:42 +08:00
break60
f164445876 Conditional judgment adds text 2020-05-15 17:13:34 +08:00
xingchun-chen
2c0b7f05ba
Merge pull request #2712 from break60/dev-1.3.0
conditions The task node adds a background color to distinguish succe…
2020-05-15 10:28:14 +08:00
xingchun-chen
58163ec755
Merge pull request #2698 from simon824/dev-1.3.0
Update dolphinscheduler_ddl.sql
2020-05-15 10:21:50 +08:00
break60
837197c60e Merge branch 'dev-1.3.0' of https://github.com/apache/incubator-dolphinscheduler into dev-1.3.0 2020-05-15 10:13:13 +08:00
Simon
83006e971e
Merge pull request #17 from apache/dev-1.3.0
Dev 1.3.0
2020-05-14 20:00:52 +08:00
dailidong
f26d2a7c20
fix worker group config no effect (#2719) 2020-05-14 18:21:59 +08:00
qiaozhanwei
f4583d78e9
add UT (#2717)
* add LoggerServerTest UT

* add LoggerServerTest UT

* add LoggerServerTest UT
add RemoveTaskLogRequestCommandTest UT
add RemoveTaskLogResponseCommandTest

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
2020-05-14 17:50:47 +08:00