lenboo
9c78e2888b
merge from dev
2020-06-30 11:18:42 +08:00
lenboo
fd76f172c1
Merge remote-tracking branch 'upstream/dev' into dev-merge
...
# Conflicts:
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/runner/TaskExecuteThread.java
2020-06-30 11:17:14 +08:00
lenboo
cb6c711833
merge from dev-1.3.0
2020-06-30 11:15:14 +08:00
zhangchunyang
8c29e2a1c0
[feature] readme.md adds instructions for changing environment variables ( #3031 )
...
Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com>
2020-06-30 11:02:25 +08:00
zhangchunyang
0fc49b2023
[bugfix] 1. fix alert.json includes repeated tag 'DOLPHIN_ALERT' 2. metainfo.xml The version number of the RPM package is no longer specified in the metainfo.xml ( #3032 )
...
Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com>
2020-06-30 10:44:52 +08:00
Yichao Yang
38e485373d
[Feature-2925][server] Init TaskLogger in TaskExecuteProcessor ( #2925 ) ( #2965 )
...
* [Feature-2925][common] Add exitVal judge in OSUtils.exeCmd (#2925 )
* optimize the logger utils
2020-06-28 17:43:13 +08:00
zhangchunyang
39b3a37abd
[bugfix] remove Conflicting configuration sudo and user ( #3038 )
...
Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com>
2020-06-28 11:37:59 +08:00
zixi0825
9bf67d80d0
Revise annotation spelling errors & Enhanced code robustness ( #3042 )
...
* revise annotation spelling errors & enhanced code robustness
* revise annotation spelling errors & enhanced code robustness
Co-authored-by: sunchaohe <sunzhaohe@linklogis.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
2020-06-28 10:48:14 +08:00
CalvinKirs
8213da50d3
[WIP] load balance #3054 ( #3057 )
...
* Load balancing abstract
* code
smell
* lower weight select
2020-06-28 10:20:59 +08:00
Jave-Chen
f1632e22c5
Set up JDK 11 for SonarCloud in github action. ( #3052 )
...
* Set up JDK 11 for SonarCloud in github action.
* Fix javadoc error with JDK 11.
* Prevent Javadoc from stopping if it finds any html errors.
2020-06-25 23:41:43 +08:00
liuhuijuan
6dffa97fdd
fix release for nginx not package config files, eg: zookeeper.properties ( #3041 )
...
* fix release for nginx bug
* add state (#3040 )
Co-authored-by: mzjnumber1@163.com <mzjnumber1@163.com>
* [BUG_FIX]fix multi-threaded tests error. (#3044 )
* fix test mock error
* fix test mock error
Co-authored-by: muzhongjiang <mu_zhongjiang@163.com>
Co-authored-by: mzjnumber1@163.com <mzjnumber1@163.com>
Co-authored-by: CalvinKirs <acm_master@163.com>
2020-06-25 14:50:31 +08:00
xingchun-chen
0dca8d8868
Merge branch 'dev' into dev-merge
2020-06-24 13:51:38 +08:00
lenboo
e343ee0ee0
remove exception ut
2020-06-24 13:02:37 +08:00
lenboo
6a52efae52
remove exception ut
2020-06-24 12:54:17 +08:00
lenboo
7da095d04d
remove exception ut
2020-06-24 11:32:04 +08:00
lenboo
3d23a6c6e6
remove exception ut
2020-06-24 11:04:42 +08:00
lenboo
513950c036
remove exception ut
2020-06-24 10:53:00 +08:00
CalvinKirs
ad28c65160
[BUG_FIX]fix multi-threaded tests error. ( #3044 )
...
* fix test mock error
* fix test mock error
2020-06-23 22:35:12 +08:00
muzhongjiang
40bbef5e3d
add state ( #3040 )
...
Co-authored-by: mzjnumber1@163.com <mzjnumber1@163.com>
2020-06-23 18:47:04 +08:00
lenboo
8c2d211450
remove duplicate code
2020-06-22 10:27:47 +08:00
xingchun-chen
8736f101b6
Merge pull request #3029 from xsbai/dev
...
Fix Issue #3017
2020-06-22 10:27:44 +08:00
lenboo
ea1c653e08
merge from dev
2020-06-22 10:21:15 +08:00
lenboo
8e7bdfa276
update ut
2020-06-22 10:17:48 +08:00
xsbai
f7533e0bd0
modifiy the error comment
2020-06-22 09:15:13 +08:00
xsbai
0654757f15
modifiy the error comment
2020-06-22 09:10:24 +08:00
xsbai
597e34bd87
Merge branch 'dev' of github.com:xsbai/incubator-dolphinscheduler into dev
2020-06-22 09:06:15 +08:00
CalvinKirs
518d03b6a6
Simplify some methods for easy understanding ( #2920 )
...
Co-authored-by: gabry.wu <8545796+gabrywu@users.noreply.github.com>
2020-06-21 15:48:35 +08:00
BoYiZhang
45785dbaef
Set default time zone ( #3006 )
...
Date type date problem in spring serializing Java
Solution: Spring serializes Java's date type date problem
Co-authored-by: gabry.wu <gabrywu@apache.org>
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-06-20 22:57:46 +08:00
xsbai
6e0b464531
fix issue #3018 [BUG]i18n incomplete ( #3022 )
...
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-06-20 22:22:55 +08:00
dailidong
4aed82c315
Merge branch 'dev' into dev
2020-06-20 21:59:33 +08:00
CalvinKirs
4aa1826718
fix testSqoopTaskTest bug ( #3024 )
2020-06-19 19:28:11 +08:00
lenboo
b81872cacd
merge from dev-1.3.0
2020-06-19 18:52:30 +08:00
xsbai
c56e555ae0
Merge branch 'dev' into dev
2020-06-19 16:56:41 +08:00
xsbai
f874e8dcce
fix issue #3018 [BUG]i18n incomplete
2020-06-19 16:43:56 +08:00
lenboo
73cae7f046
merge from dev-1.3.0
2020-06-19 15:19:32 +08:00
gabry.wu
a65cb48191
always send emails no matter there are results ( #3015 )
...
* always send emails no matter there are results
* always send emails no matter there are results
2020-06-19 14:50:10 +08:00
dailidong
620ecffa72
fix singe resource manager will NPE ( #3013 )
...
* 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
* remove param monitor server state
* fix table T_DS_ALERT
* update h2 database
* fix #2910 master server will show exception for some time when it restart
* fix oom when no master is active
* fix worker oom when master server restart
* fix oom
* fix
* add UT
* fix worker group config no effect
* fix singe resource manager will NPE
* Update HadoopUtilsTest.java
2020-06-19 14:45:48 +08:00
lenboo
714ae33e40
merge from dev
2020-06-19 14:20:24 +08:00
break60
08beae8358
Fix unfiltered jar files in resource directory and UDF upload resource parameters ( #3008 )
...
* Change email to default
* Fix unfiltered jar files in resource directory and UDF upload resource parameters
2020-06-17 18:52:06 +08:00
Erik-ly
eef397675b
Fix bug #2991 duplicate key: DOLPHIN_ALERT ( #2993 )
...
edit duplicate DOLPHIN_ALERT and label
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-06-17 14:38:27 +08:00
lgcareer
25607f8815
fix download resource file that under the directory error ( #3007 )
...
* add mybatis-3 notice in the top-level notice
* fix download resource file that under the directory error
2020-06-17 12:04:34 +08:00
Yichao Yang
0744d4070c
[Hotfix-2922][common] Fix Jackson UDde error ( #2922 ) ( #2926 )
...
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-06-17 11:33:41 +08:00
lgcareer
1c47a15ddb
add mybatis-3 notice in the top-level notice ( #3003 )
2020-06-17 11:00:38 +08:00
superScala
8031c1624a
add break & default logic for NettyDecoder.decode ( #2969 )
...
* add break & default logic for NettyDecoder.decode
* fix the bad code smells
Co-authored-by: gabry <wu_shao_jie@qq.com>
Co-authored-by: gabry.wu <8545796+gabrywu@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-06-16 14:25:40 +08:00
Yichao Yang
f7ea4f1978
[Feature-2127][sql-schema] Fix the mysql version limited error for 5.5x - 5.64 ( #2911 )
...
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-06-15 23:21:33 +08:00
break60
f26367fa47
Change email to default ( #2981 )
2020-06-15 20:53:41 +08:00
Rubik-W
24c7f764f6
Merge pull request #2734 from gabrywu/removeUnnecessaryLock
...
remove unnecessary lock & fix syncWorkerHostWeight variable reference
2020-06-15 11:55:39 +08:00
gabry.wu
f532853f60
Merge branch 'dev' into removeUnnecessaryLock
2020-06-15 11:14:47 +08:00
743294668
a58d1b3b45
Modify OracleDB connection string format. ( #2970 )
...
Co-authored-by: taoyuxin <taoyuxin@inspur.com>
2020-06-15 11:12:22 +08:00
xingchun-chen
40269a5db3
Merge pull request #2972 from break60/dev-1.3.0
...
Delete the pom files animation.scss, _normalize.scss and _animation.s…
2020-06-15 09:27:37 +08:00