Commit Graph

3971 Commits

Author SHA1 Message Date
baoliang
ee012ce071 merge from 1.3.3-release 2020-11-09 19:14:07 +08:00
baoliang
e2c2d3efde merge from 1.3.3-release 2020-11-09 19:09:14 +08:00
baoliang
1c97cfc96d merge from 1.3.3-release 2020-11-09 18:56:28 +08:00
baoliang
3bb0f3bfb2 refactor ut test 2020-11-09 18:51:00 +08:00
baoliang
30cf144421 refactor ut test 2020-11-09 18:33:57 +08:00
baoliang
273cbc5369 merge from 1.3.3-release 2020-11-09 17:38:45 +08:00
baoliang
b3dbc63c72 merge from 1.3.3-release 2020-11-09 17:33:06 +08:00
baoliang
d0c8dadc94 merge from 1.3.3-release 2020-11-09 17:27:57 +08:00
baoliang
ce4d123347 merge from 1.3.3-release 2020-11-09 17:24:44 +08:00
baoliang
8f5f1a61c5 merge from 1.3.3-release 2020-11-09 16:58:58 +08:00
baoliang
cbf47dad77 refactor code style 2020-11-09 15:50:26 +08:00
baoliang
8b879746cc refactor code style 2020-11-09 15:49:20 +08:00
baoliang
ab7748d6a0 refactor code style 2020-11-09 15:48:12 +08:00
baoliang
e053858e92 merge from 1.3.3-release 2020-11-09 15:38:21 +08:00
baoliang
67baba271e merge from 1.3.3-release 2020-11-09 15:34:08 +08:00
baoliang
dd091a072f merge from 1.3.3-release 2020-11-09 15:19:30 +08:00
baoliang
a5efe97eb3 merge from 1.3.3-release 2020-11-09 14:41:50 +08:00
baoliang
add6f37b77 merge from 1.3.3-release 2020-11-09 11:24:52 +08:00
baoliang
685d09eb25 merge from 1.3.3-release 2020-11-09 11:12:33 +08:00
baoliang
a8205c2a9b merge from 1.3.3-release 2020-11-09 10:57:27 +08:00
bao liang
7239979167
Merge branch 'dev' into 133-merge-dev 2020-11-09 10:08:19 +08:00
zhuangchong
4b502e361f
[Improvement-4012][common/remote] Json util code integration,remove the remote module json util (#4013)
* Json util code integration,remove the remote module json util.

* update code checkstyle.

* update code checkstyle.

* add code checkstyle.

* add test class.

* update JSONUtils class.

* update JSONUtils class.
2020-11-07 19:37:48 +08:00
baoliang
536974d351 merge from 1.3.3-release 2020-11-06 11:54:42 +08:00
baoliang
403a4a20f2 merge from 1.3.3-release 2020-11-06 11:44:34 +08:00
baoliang
381d23ea4f merge from 1.3.3-release 2020-11-06 00:03:20 +08:00
JinyLeeChina
2830ab1d4d
fix #3688, Optimization of table building statements (#3689) 2020-11-03 21:10:50 +08:00
Kirs
f4c14dea53
Merge pull request #4009 from BoYiZhang/pr_4008
[Improvement-4008][Swagger] The resources API document does not match the interface parameters
2020-11-02 10:08:23 +08:00
huzekang
c54d09605b
[Improvement][script] daemon script usage (#3968)
* Improvement daemon script usage

* don't remove status command

don't remove status command

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-10-30 22:07:24 +08:00
IamMujuziMoses
c7b5956c5a
[Feature-3941][ui] Remove tenant name (#3949)
* FeatureUI-3941: Removed Tenant

* FeatureUI-3941: Removed tenantName in the suggested pages

* FeatureUI-3941: Updated the suggested files

* FeatureUI-3941: Updated the TenantController

* FeatureUI-3941: Updated the TenantController and the pom.xml

* FeatureUI-3941: Updated the TenantControllerTest
2020-10-30 12:18:00 +08:00
BoYiZhang
83cc28939f
Update udfs.vue 2020-10-29 18:55:22 +08:00
zhanglong
a6266b7c44 reset code 2020-10-29 18:51:20 +08:00
zhanglong
584a787406 fix bug 2020-10-29 18:50:24 +08:00
lgcareer
be07cb62db [maven-release-plugin] prepare for next development iteration 2020-10-29 17:49:28 +08:00
lgcareer
55242916b2 [maven-release-plugin] prepare release 1.3.3 2020-10-29 17:49:18 +08:00
bao liang
389c90ead6
fix bug 4010: remove failed condition tasks from error-task-list. (#4011)
Co-authored-by: baoliang <baoliang@analysys.com.cn>
2020-10-29 17:37:28 +08:00
lgcareer
b01898a8eb [release]revert pom version to 1.3.3-release 2020-10-29 17:29:38 +08:00
zhanglong
c614bd39cc the resources API document does not match the interface parameters 2020-10-29 15:52:22 +08:00
BoYiZhang
c86ff41a86
Merge pull request #24 from apache/dev
update code from apache
2020-10-29 13:54:27 +08:00
lgcareer
1076a2349c [maven-release-plugin] prepare for next development iteration 2020-10-28 19:19:46 +08:00
lgcareer
ed016499aa [maven-release-plugin] prepare release 1.3.3 2020-10-28 19:19:35 +08:00
lgcareer
0d21fa9e3b revert pom version to 1.3.3-release 2020-10-28 19:11:35 +08:00
bao liang
026957d024
[FIX-3929] because of no lock, start up failover would dispatch two same tasks. (#4004)
* fix #3966 sub process doesnot send alert mail after process instance ending.

* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.

* fix code smell

* fix code smell

* fix code smell

* update worker group inherit from parent

* remove stdout in logback configuration

* fix bug #3929 condition task would post error when failover.

* remove unused test

* add comments

* add skip node judge

* fix bug 3929: because of no lock, start up failover would dispatch two same tasks.

Co-authored-by: baoliang <baoliang@analysys.com.cn>
2020-10-28 18:39:32 +08:00
bao liang
6caac0f366
[FIX-3929] condition task would post wrong tasks when failover. (#3999)
* fix #3966 sub process doesnot send alert mail after process instance ending.

* fix bug 3964: sub_process The timeout warning does not take effect
add timeout warning for sub_process/dependent task.

* fix code smell

* fix code smell

* fix code smell

* update worker group inherit from parent

* remove stdout in logback configuration

* fix bug #3929 condition task would post error when failover.

* remove unused test

* add comments

* add skip node judge

Co-authored-by: baoliang <baoliang@analysys.com.cn>
2020-10-27 17:37:59 +08:00
Kirs
c11d97f778
Merge pull request #3996 from KnightChess/Fix-3994
[Fix-#3994 ][sql-script] Pull Request fix import dolphinscheduler_mysql.sql insert admin user data
2020-10-27 09:08:21 +08:00
wulingqi
cd3dff5f90 fix import dolphinscheduler_mysql.sql insert admin user data 2020-10-26 22:13:49 +08:00
孙继峰
afd0e6ab65
[Test-3557][API] full cover DataAnalysisServiceImpl (#3605)
* generate equals and hashCode method

* make up for the state of oblivion

* simplify countQueueState method

* delete try catch, because this never throw exception

* full cover DataAnalysisServiceImpl

* improve test coverage

* adjust code style

* simplify countCommandState method

* reduce duplication

* simplify countTaskDtos method

* Update DataAnalysisServiceImpl.java

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-10-26 21:29:37 +08:00
t1mon
e9479e4a03
[fix-#3962][api] Avoid ClassCastException for LoggerService.queryLog(). (#3963) 2020-10-26 18:26:42 +08:00
BoYiZhang
d520cefdd4
Merge pull request #23 from apache/dev
update code from apache
2020-10-25 23:29:47 +08:00
Kirs
05b248f8e3
Merge pull request #3957 from BoYiZhang/pr_3956
[Fix-#3956][Master] When running a task, the resource file is lost
2020-10-24 17:50:33 +08:00
BoYiZhang
187c5c1267
Merge pull request #22 from apache/dev
update code from apache
2020-10-24 14:06:59 +08:00