Commit Graph

2817 Commits

Author SHA1 Message Date
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
break60
e765d074fd Merge branch 'dev-1.3.0' of https://github.com/apache/incubator-dolphinscheduler into dev-1.3.0 2020-05-14 16:42:50 +08:00
qiaozhanwei
689c216050
add LoggerServerTest UT (#2713)
* add LoggerServerTest UT

* add LoggerServerTest UT

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
2020-05-14 15:21:46 +08:00
break60
5b98750500 conditions The task node adds a background color to distinguish successful and failed connections 2020-05-13 15:51:39 +08:00
liwenhe1993
247830ab89
Merge pull request #2683 from khadgarmage/feature/docker_for_release
migrate docker-composer of ut and move dockerfile dir to docker/build
2020-05-12 21:00:45 +08:00
xiaochun.liu
b9bc052abe merge from dev1.3.0 2020-05-12 20:35:38 +08:00
liwenhe1993
29a353e689
Using docker/docker-swarm/docker-compose.yml to run pg and zk in ci_ut.yml (#2692)
* Using docker/docker-swarm/docker-compose.yml to run pg and zk in ci_ut.yml

1. add initdb volume for pg service in docker-compose.yml
2. modify ci_ut.yml

* add sudo in ci_ut.yml

* Query the metadata of indexes is not correct in postgresql/dolphinscheduler_ddl.sql

1. replace information_schema.STATISTICS to pg_stat_all_indexes
2. modify ProcessDefinitionMapperTest.java

* Remove inner zk and pg

* add inner pg
2020-05-12 20:24:17 +08:00
Simon
da4863cbee
Merge pull request #16 from apache/dev-1.3.0
Dev 1.3.0
2020-05-12 18:55:39 +08:00
Simon
01045178b7
Update dolphinscheduler_ddl.sql 2020-05-12 18:35:14 +08:00
qiaozhanwei
443a6d1935
delete log files while deleting process instances #2463 (#2693)
* script variable has "processDefinitionId" is error #2664

* blank in eamil and left font align  #2648

* delete log files while deleting process instances #2463

* delete log files while deleting process instances #2463

* delete log files while deleting process instances #2463

* delete log files while deleting process instances #2463

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
2020-05-12 16:54:29 +08:00
dailidong
06c4ddf8e3
add worker group config (#2681)
* 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

* add worker group config

* add worker group config

Co-authored-by: lidongdai <escheduler@outlook.com>
Co-authored-by: dailidong <dolphinschedule@gmail.com>
2020-05-12 16:49:40 +08:00
bao liang
d99471806e
[bug fix] some bugs from 1.2.0 to 1.3.0 (#2676)
* 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

Co-authored-by: baoliang <baoliang@analysys.com.cn>
2020-05-12 16:46:16 +08:00
xiaochun.liu
0d453727d3 delete dockerfile zk 2020-05-12 09:05:26 +08:00
xiaochun.liu
31d05e7e88 delete dockerfile zk 2020-05-12 08:32:43 +08:00
xiaochun.liu
27221d775b delete dockerfile zk 2020-05-12 08:31:52 +08:00
xiaochun.liu
9052dad4dc delete docker-compose old 2020-05-12 07:43:55 +08:00
xiaochun.liu
c1215add7a alter dockerfile to docker/build dir 2020-05-12 00:21:21 +08:00
xiaochun.liu
39a281c543 ut docker 2020-05-12 00:10:52 +08:00
xiaochun.liu
e35e4c0dd5 migrate docker composer and move dockerfile dir to docker/build 2020-05-12 00:05:36 +08:00
liwenhe1993
3c014c5a57
fix zookeeper health check and merge volumes into logs volume (#2674)
* fix zookeeper health check and merge volumes into logs volume

1. Fix zookeeper health check
2. Merge volumes into logs volume
3. Modify `dockerfile/hooks/build` script

* Modify ci_e2e and docker image registry

* Modify ci_e2e

* Modify ci_e2e

* Modify ci_e2e and move ./dockerfile/hooks/check to ./docker/docker-swarm/
2020-05-11 23:22:04 +08:00
qiaozhanwei
83ede1037e
blank in eamil and left font align #2648 (#2673)
* script variable has "processDefinitionId" is error #2664

* blank in eamil and left font align  #2648

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
2020-05-11 14:49:29 +08:00