Commit Graph

119 Commits

Author SHA1 Message Date
khadgarmage
c447bb489f add stringutils ut (#1921)
* add stringutils ut
2020-02-10 13:52:32 +08:00
gabry.wu
b77dddfeef Adapting partial code(file name start with B) to the sonar cloud rules (#1915)
* Adapting partial code(file name start with B) to the sonar cloud rules

* add @Ignore to BaseTaskQueueTest class
2020-02-09 17:56:55 +08:00
xiaochun.liu
2f33a9e2ab delete dup code 2020-02-09 10:20:18 +08:00
xiaochun.liu
bd10b78e29 delete dup code 2020-02-09 10:09:31 +08:00
xiaochun.liu
3364a8c8a9 add script runner ut 2020-02-08 21:22:20 +08:00
Jave-Chen
b3b075d915
Fix bug: Use try-with-resources or close this "Statement" in a "finally" clause. (#1702)
* #1701  Fix bug: Use try-with-resources or close this "Statement" in a "finally" clause.

* fix some indent

* refix code smell
2020-02-06 19:32:31 +08:00
dailidong
c63cd3e237
combine logback config of master/worker/alert/api server to one (#1898)
* combine logback config of master/worker/alert/api server to one logback.xml
2020-02-06 11:08:06 +08:00
魔方不在手
f942e5ced3
[feature] data synchronization function (#1881)
* feature:data synchronization function

* feature:data synchronization function

* feature:data synchronization function

* fix:add license

* fix:resource close bug

* fix:remove class author

* fix:Improve test coverage

* fix:add UT

* fix:add UT

* fix:data sync node renamed to datax

* fix:add UT

* fix: UT bug

* fix:Optimize variable name

* fix:pom

* fix:Variable name error

* fix:optimize the code
2020-02-06 09:29:23 +08:00
Yelli
5169689c35
class overrides equals() and should therefore also override hashCode() (#1882) 2020-02-03 10:24:24 +08:00
Tboy
38eaaa98e6 some updates for TaskQueueZkImpl (#1874)
small changes, no need more people review, I will merge.
2020-01-27 21:09:11 +08:00
gabry.wu
0d5c6e4e7c [Feature] set acquireTriggersWithinLock true (#1866)
issue: https://github.com/apache/incubator-dolphinscheduler/issues/1863
2020-01-22 21:09:12 +08:00
liwenhe1993
30db5c1467 Api module relp server module/1756 (#1766)
* Remove server module on api module

1. Remove server module and add dao module.
2. Move quartz in server module to dao module.
3. Update config and class.


to resolve conflicts,I deleted CombinedApplicationServer.java

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-01-20 16:26:23 +08:00
Jave-Chen
16913bacd7 fix return, obj error (#1855) 2020-01-17 21:55:50 +08:00
Jave-Chen
c522ea7ebb Fix bug: NullPointerException etc. (#1721)
* #1720 Fix bug: NullPointerException etc.

* fix code smell

* Update DateInterval.java

refactor equals method

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-01-17 16:55:01 +08:00
lgcareer
779672ec2a [Fix issue #1770]check udf and data source in order to fix issue 1770 (#1826)
* check udf and data source in order to fix issue 1770

* check udf and data source in order to fix issue 1770

* update testListAuthorizedUdfFunc
2020-01-15 15:07:00 +08:00
ZHAOLIPAN
07f96375b3 replace strings with constants already exist. (#1825) 2020-01-15 14:00:28 +08:00
bao liang
0b272f9ca6 [feature] #1813 remove "_001" after the master/server register path in zookeeper (#1820)
* change master/worker register path.

* remove "_" from register path.
2020-01-14 16:27:10 +08:00
ZHAOLIPAN
68f736953b fix typos (#1821) 2020-01-14 16:15:34 +08:00
DK.Pino
ea0caef88f Regularize quartz.properties conf file (#1783)
* remove lombok dependency(last)

* regularize quartz.properties conf file
2020-01-09 16:53:03 +08:00
Yelli
2ec9943f64 fix bug: zk hasTask method NPE (#1785) 2020-01-09 14:50:15 +08:00
gabry.wu
88b022cb57 ITaskQueue should have "hasTask" function (#1744)
* issue https://github.com/apache/incubator-dolphinscheduler/issues/1742

* remove unnecessary catch

* fix exception type

* fix bad code smell

* remove log exceptions

* catch exception
2020-01-09 10:41:48 +08:00
bao liang
e0e0696b4f add out put log when master/worker server start (#1769)
* 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

* rename .dolphinscheduler_en.sh to dolphinscheduler_env.sh
remove some unused in install.sh

* add out put log when master/worker server start...

* add start log when servers start
2020-01-09 10:36:15 +08:00
Yelli
963ed4a8c6 ds.server & ds.common.zk regularize log print (#1754) 2020-01-08 10:00:34 +08:00
xingchun-chen
dad643dbb5 commom/Preconditions Util Test (#1727)
* common/parameterUtils unit test
2020-01-06 15:51:55 +08:00
Tboy
4d1abb3fc7 remove commons-lang3 dependancy (#1709)
* remove commons-lang3 dependancy

* remove commons-lang3 dependancy

* remove unused import
2020-01-04 18:01:10 +08:00
khadgarmage
5f145efa6b DependentUtils.java ut (#1703)
* delete bytes file

* DependentUtilsTest.java ut
2020-01-04 17:58:29 +08:00
Yelli
7ecd38f7d6 fix sonar bug: change condition & not enough arguments (#1692)
* modify FileUtils.readFile2Str

* #1300 Add right alignment function in sql email content

* cancel formatted for alert_mail_template.ftl

* #747 sql task password Log desensitization

* cancel mail_temple

* edit ExcelUtils

* modify test method name

* #747 sql task password Log desensitization

* #1544 workflow import

* Constants add DATASOURCE_PASSWORD_REGEX

* #747 sql task password Log desensitization

* deal with import project have sub process

* modify export process addTaskNodeParam method name

* add testAddTaskNodeSpecialParam UT

* add ProcessDefinitionServiceTest-ut to pom

* add testImportSubProcess in ProcessDefinitionServiceTest

* add testImportSubProcess in ProcessDefinitionServiceTest

* add testImportProcessDefinition

* fix sonar bug: not enough arguments

* fix sonar bug: change condition & not enough arguments
2020-01-04 11:32:07 +08:00
Tboy
0a3954107e
Merge pull request #1699 from lgcareer/dev-taskqueue
get root path from zookeeper config
2020-01-03 19:30:51 +08:00
Tboy
672a48255a
Merge pull request #1700 from fordeal-smalldata/fix-task-zknode-miss
Fixed tasks_queue and tasks_kill did not exist in zookeeper #1696
2020-01-03 19:30:21 +08:00
elonlo
cae656c1bc uniform naming 2020-01-03 19:26:06 +08:00
Tboy
884237487c remove commons-lang3 dependancy, using common-module instead for server module (#1698)
* remove commons-lang3 dependancy

* remove commons-lang3 and commons-lang dependancy

* remove commons-collections4/commons-logging/commons-io dependancy

* tmp add commons-lang3 for compile

* remove commons-lang3 dependancy, using common-module instead

* remove common StringUtils instead of lang3

* add tmp lang3 for compile
2020-01-03 19:23:05 +08:00
elonlo
c21d25edf2 Fixed tasks_queue and tasks_kill did not exist in zookeeper #1696 2020-01-03 18:37:39 +08:00
lgcareer
8090f14504 get root path from zookeeper config 2020-01-03 18:05:00 +08:00
Tboy
0e66c71f38 remove commons-collections4/commons-logging/commons-io dependancy for API module (#1693)
* remove commons-lang3 dependancy

* remove commons-lang3 and commons-lang dependancy

* remove commons-collections4/commons-logging/commons-io dependancy

* tmp add commons-lang3 for compile
2020-01-03 16:10:18 +08:00
Yelli
216154dc06 fix sonar bug: null check & clean throw exception (#1690)
* fix sonar bug: null check & clean throw exception

* fix sonar bug: null check & clean throw exception
2020-01-03 11:46:51 +08:00
Yelli
a80e90276f fix sonar bug: not enough arguments (#1687)
* modify FileUtils.readFile2Str

* #1300 Add right alignment function in sql email content

* cancel formatted for alert_mail_template.ftl

* #747 sql task password Log desensitization

* cancel mail_temple

* edit ExcelUtils

* modify test method name

* #747 sql task password Log desensitization

* #1544 workflow import

* Constants add DATASOURCE_PASSWORD_REGEX

* #747 sql task password Log desensitization

* deal with import project have sub process

* modify export process addTaskNodeParam method name

* add testAddTaskNodeSpecialParam UT

* add ProcessDefinitionServiceTest-ut to pom

* add testImportSubProcess in ProcessDefinitionServiceTest

* add testImportSubProcess in ProcessDefinitionServiceTest

* add testImportProcessDefinition

* fix sonar bug: not enough arguments
2020-01-03 11:24:01 +08:00
Tboy
a9cd31eca6 remove commons-lang3 and commons-lang dependancy for Dao module (#1663)
* remove commons-lang3 dependancy

* remove commons-lang3 and commons-lang dependancy
2020-01-03 11:14:19 +08:00
DK.Pino
0bfb0e4b16 remove lombok depend in common dodule (#1677) 2020-01-02 17:14:34 +08:00
khadgarmage
bb414b0794 delete bytes file (#1669) 2020-01-02 10:15:37 +08:00
khadgarmage
bc8e06bb08
SchemaUtils.java TaskParametersUtils.java unit test (#1660)
* schemautils test and TaskParametersUtils test
2019-12-31 22:51:56 +08:00
Tboy
677e9cfd33 remove commons-lang3 dependancy (#1655) 2019-12-31 16:03:08 +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
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
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
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
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
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