Commit Graph

2120 Commits

Author SHA1 Message Date
Tboy
e621d958d1
Merge pull request #1643 from Technoboy-/dev
remove swagger-annotations in DAO module
2019-12-31 10:06:25 +08:00
Jave-Chen
a51242d445 Merge ut sonarcloud into one file (#1647)
* merge ut and sonarcloud to one action
turn on sonarcloud ut

* fix error

* test in github
2019-12-30 21:21:39 +08:00
loushang
e25342c96f Merge branch 'dev' of https://github.com/clay4444/incubator-dolphinscheduler into dev 2019-12-30 19:46:33 +08:00
AmoryWang
e1d39e1e8e add UT for common thread package (#1628)
* add common thread ut

* Update ThreadUtilsTest.java

add license header

Co-authored-by: dailidong <dailidong66@gmail.com>
2019-12-30 19:42:48 +08:00
qiaozhanwei
b73979360e DataSourceMapperTest UT modify #1465 (#1642)
* remove LogViewServiceGrpc.java file and pom modify

* remove kazoo

* remove kazoo

* remove kazoo

* remove common monitor package

* add license

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* install.sh remove python kazoo

* add system param whether repeat running

* remove kazoo modify

* BusinessTimeUtils remove whther repeat running inner param

* add AccessTokenMapperTest UT

* CI UT yml modify,start postgresql and zookeeper by default

* add AlertGroupMapperTest UT in github action

* Conflicts reslove

* AlertMappert UT modify

* AlertMappert UT modify

* AlertMappert UT modify

* CommandMapperTest UT modify

* DataSourceMapperTest UT modify
2019-12-30 19:01:08 +08:00
loushang
dc4e46db41 fix Monitor bug 2019-12-30 18:58:38 +08:00
loushang
2106374dc8 Merge remote-tracking branch 'upstream/dev' into dev 2019-12-30 18:47:50 +08:00
lilin
d5fe55ad56 modify UdfFuncServiceTest UT 2019-12-30 18:44:03 +08:00
samz406
257a3ee3e3
Merge pull request #18 from apache/dev
update
2019-12-30 18:38:34 +08:00
Tboy
4032c4e64b
Merge pull request #1618 from samz406/1227-2
before delete Udf check exist
2019-12-30 18:30:49 +08:00
lilin
96d49a0950 remove delete check exist 2019-12-30 18:26:10 +08:00
dk.technoboy
cc786e6d76 remove swagger-annotations 2019-12-30 18:18:18 +08:00
bao liang
d16500e8be [Feature] merge some configurations #1635 (#1636)
* merge hadoop.properties into common.properties

* merge hadoop,zookeeper.properties into common.properties
remove combined.properties/master.properties/worker.properties

* change db user/pwd to test/test
2019-12-30 18:14:31 +08:00
Tboy
2bb3729f3e
Merge pull request #9 from apache/dev
merge
2019-12-30 18:14:21 +08:00
break60
426c027ddf Click the run button to add the workflow name echo #1339 Point 11 (#1638)
* Increase script text box to zoom in and fix log loading

* Timing operation adds default value for start and end dates

* Click the run button to add the workflow name echo
2019-12-30 18:11:14 +08:00
Tboy
5e935d579e refactor AbstractZKClient (#1627)
* we should insert alert DB once , and trigger this type of alert 3 times

* refactor AbstractZKClient
2019-12-30 17:59:06 +08:00
samz406
503be5f400 add service UT (#1637)
* User update  not check params

* user phone update when noteEmpty

* modify saveWorkerGroup may NPE

* add some service UT

* add  service ut include
2019-12-30 17:24:34 +08:00
samz406
6d4a3410c8 modify saveWorkerGroup may NPE (#1629)
* User update  not check params

* user phone update when noteEmpty

* modify saveWorkerGroup may NPE
2019-12-30 10:31:35 +08:00
Jave-Chen
dad75727ff fix bug (#1633)
dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/utils/EnterpriseWeChatUtils.java
      https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&issues=AW9PvkP_YzPBRjkobY7y&open=AW9PvkP_YzPBRjkobY7y
      https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&issues=AW9PvkP_YzPBRjkobY7z&open=AW9PvkP_YzPBRjkobY7z

    dolphinscheduler-alert/src/main/java/org/apache/dolphinscheduler/alert/AlertServer.java
      https://sonarcloud.io/project/issues?id=apache-dolphinscheduler&issues=AW9PvkRwYzPBRjkobY87&open=AW9PvkRwYzPBRjkobY87
2019-12-30 10:28:47 +08:00
Technoboy-
b053322466 refactor AbstractZKClient 2019-12-29 16:54:40 +08:00
Tboy
98a7daa6b8
Merge pull request #8 from apache/dev
merge
2019-12-29 16:05:37 +08:00
Jave-Chen
d3d5726aeb Add github action to analyze code with sonarcloud (#1624)
* Create .sonarcloud.properties
* add License description
2019-12-29 13:15:29 +08:00
qiaozhanwei
e61586cd06 CommandMapperTest UT modify #1465 (#1625)
* CommandMapperTest UT modify
2019-12-29 13:12:29 +08:00
break60
779decc96d Increase script text box to zoom in and fix log loading #1547 、#1247 (#1604)
* Increase script text box to zoom in and fix log loading

* Timing operation adds default value for start and end dates
2019-12-29 10:23:10 +08:00
Tboy
87738af235
Merge pull request #1615 from samz406/1227-queue
queue return info is not correct
2019-12-29 10:20:18 +08:00
samz406
b03632bc6d User update not check params (#1619)
* misspell  words

* modify common queue TaskQueueZKImplTest.java unit test

* extends  BaseTaskQueueTest get zkServer

* modify zk config

* User update  not check params

* user phone update when noteEmpty
2019-12-29 10:13:14 +08:00
Tboy
2a0dab14ee we should insert alert DB once , and trigger this type of alert 3 times (#1622) 2019-12-29 10:11:41 +08:00
qiaozhanwei
e9fcf6128e
AlertMappert UT modify #1465 (#1616)
* remove LogViewServiceGrpc.java file and pom modify

* remove kazoo

* remove kazoo

* remove kazoo

* remove common monitor package

* add license

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* remove kazoo modify

* install.sh remove python kazoo

* add system param whether repeat running

* remove kazoo modify

* BusinessTimeUtils remove whther repeat running inner param

* add AccessTokenMapperTest UT

* CI UT yml modify,start postgresql and zookeeper by default

* add AlertGroupMapperTest UT in github action

* Conflicts reslove

* AlertMappert UT modify

* AlertMappert UT modify

* AlertMappert UT modify
2019-12-29 09:59:49 +08:00
Technoboy-
cfd3266ca2 we should insert alert DB once , and trigger this type of alert 3 times 2019-12-28 21:35:10 +08:00
Tboy
dce7441bea
Merge pull request #1611 from wenhemin/fixbug-20191227
fix:In a cluster environment, verify that nodes have matching bug. #{1613}
2019-12-28 20:01:48 +08:00
Tboy
f42dc82636
Merge pull request #1621 from Technoboy-/dev
refactor getKillProcessThread method
2019-12-28 20:00:36 +08:00
Tboy
49181fd08e
Merge pull request #1607 from samz406/1227-token
project checkResult may NPE
2019-12-28 19:57:42 +08:00
Tboy
34b6537350
Merge pull request #1608 from JinyLeeChina/dev
[fix] process instance alert bug #1595
2019-12-28 19:56:12 +08:00
Technoboy-
04df353b4c refactor getKillProcessThread method 2019-12-28 19:24:38 +08:00
Tboy
4b5f60d96e
Merge pull request #6 from apache/dev
merge
2019-12-28 19:22:36 +08:00
loushang
4754945c5f fix CONFLICT 2019-12-27 22:12:15 +08:00
lilin
62f54eed7f 1 Modify judgment order(调整顺序,先判断是否存在)
2 before delete check entity exist
2019-12-27 18:21:21 +08:00
lilin
759d997616 Merge branch '1227-2' of ssh://github.com/samz406/EasyScheduler into 1227-2 2019-12-27 18:15:35 +08:00
lilin
ce76f3eab7 1 Modify judgment order
2 before delete check entity exist
2019-12-27 18:11:48 +08:00
samz406
c6150e3824
Merge pull request #15 from apache/dev
update
2019-12-27 18:02:07 +08:00
lilin
d91e0155c7 1when queue or queName is null,return info param is null
2 update queue may NPE
2019-12-27 17:35:15 +08:00
samz406
be5fc116ef update resource may NPE (#1610)
* misspell  words

* modify common queue TaskQueueZKImplTest.java unit test

* extends  BaseTaskQueueTest get zkServer

* modify zk config

* update resource may NPE
2019-12-27 17:20:34 +08:00
lgcareer
7f27c8a86e update assemble and rpmbuild because config/*.* remove script to dolphinscheduler-server/src/main/resources (#1609) 2019-12-27 17:05:28 +08:00
DK.Pino
b6cca46d8f remove lombok annocation (#1603) 2019-12-27 17:04:25 +08:00
DK.Pino
63f396b61f refactor zk tree cache (#1577)
* refactor zk tree cache

* refactor zk tree cache
2019-12-27 17:03:10 +08:00
samz406
597d685955 delAlertgroupById add entity exist check (#1602)
* misspell  words

* modify common queue TaskQueueZKImplTest.java unit test

* extends  BaseTaskQueueTest get zkServer

* modify zk config

* add MonitorServiceTest

* mobile phone need 11 number

* delete file

* delAlertgroupById add entity exist check
2019-12-27 17:00:33 +08:00
Tboy
8b2b5ba684 refactor TaskQueueZkImpl (#1591)
* fix #1515

* sleep when resource in not satisfy. fix #1522

* add sleep 1s for no command

* fix MasterBaseTaskExecThread submit method bug

* updates

* add log

* delete lombok

* remove duplicate code

* refactor TaskQueueZkImpl

* ignore First , we have to rewrite

* updates
2019-12-27 17:00:06 +08:00
DK.Pino
aadf0aae46 remove lombok annocation (#1600) 2019-12-27 16:59:47 +08:00
温合民
3c6780c3cd fix:In a cluster environment, verify that nodes have matching bug. 2019-12-27 16:53:51 +08:00
DK.Pino
c17fe38a6c remove lombok annocation (#1605) 2019-12-27 16:41:34 +08:00