Commit Graph

304 Commits

Author SHA1 Message Date
Zhou Zheng
90a060128f 修改与新增commandType相关的代码
1. dataAnalysis
2. alertManager
3. businessTimeUtils的schedule选择
2020-08-07 15:39:48 +08:00
Zhou Zheng
d0e6b09dd1 加入valid检验 2020-08-05 23:30:09 +08:00
Zhou Zheng
93653768c8 支持sub-process和condition的TFS 2020-08-04 20:14:36 +08:00
Zhou Zheng
3fceee9570 从强制成功的节点处启动-apiserver部分
1. 新添加executeType
2. 新添加对应的commandType
3. 修改controller对应的service部分
4. 补充processService中的verifyIsNeedCreateCommand的判断逻辑
2020-07-23 22:50:32 +08:00
Zhou Zheng
d86ceeecbe [implement] change task state 2020-07-23 21:54:48 +08:00
JinyLeeChina
0f6f138dc8
[BugFixed] issue #3258 (#3265)
* 'ExecutionStatus'

* '3258'

* Update WorkerGroupServiceTest.java

* Delete UserState.java

* Delete ResourceSyncService.java

* Delete core-site.xml

* Delete hdfs-site.xml

Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
2020-07-22 11:50:19 +08:00
Yichao Yang
b4af3fd176
[Feature-2815][server] One worker can belong to different workergroups (#2934)
* [Feature-2815][server] One worker can belong to different workergroups

* Feature: Add test cases

* Update MonitorService.java

* Update MonitorService.java

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-07-13 17:25:13 +08:00
bao liang
657ea4752f
merge from 1.3.1-release (#3161)
* merge from 1.3.1-release

* [bugfix] remove Conflicting configuration sudo and user (#3038)

Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com>

* remove some standard notices in order to cut down the NOTICE file. (#3101)

* #3084 remove some standard notices in order to cut down the NOTICE file.

* update exclude element sql/soft_version of rat plugin

* update soft_version

* merge from 1.3.1-release

* fix 3112:download udf resource need find the tenant code of resource owner (#3114)

* fix 3112:download udf resource need find the tenant code of resource owner

* fix 2975:download resource need find the tenant code of resource owner

* remove useless code

* merge from 1.3.1-release

* remove some notes (#3127)

Co-authored-by: lenboo <baoliang@analysys.com.cn>

* fix Permission denied if not found dolphinscheder-env.sh on 1.3.1 (#3128)

* fix Permission denied if not found dolphinscheder-env.sh

* update some comments on method

* add PropertyPlaceholderHelper on license (#3129)

* update license header location

* add PropertyPlaceholderHelper on license

* merge from 1.3.1-release

* change from 1.3.0  to 1.3.2

* add Set import

Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: zhangchunyang <zhangchunyang0123@gmail.com>
Co-authored-by: zhangchunyang1024 <zhangchunyang0123@gamil.com>
Co-authored-by: lgcareer <18610854716@163.com>
Co-authored-by: lenboo <baoliang@analysys.com.cn>
2020-07-13 16:35:42 +08:00
Yichao Yang
5868af8947
[Hotfix-3131][api] Fix the new tenant already exists prompt (#3132)
* Bugfix: Fix the new tenant already exists prompt

* Feature: Add test cases

* Update TenantServiceTest.java

Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
2020-07-13 08:48:59 +08:00
samz406
6fa3701396
optimize SchedulerService.setScheduleState code (#3136)
* Optimize SchedulerService.setScheduleState code

* modify the test case to PowerMock

* modify code smell

* modify code smell

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-07-12 09:48:44 +08:00
sky
d4d6aded11
feature user register (#3159)
fix bug

fix security problem

fix security problem

Co-authored-by: dev_sky <dev_sky@740051880@qq.com>
2020-07-07 16:34:50 +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
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
lenboo
ea1c653e08 merge from dev 2020-06-22 10:21:15 +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
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
lenboo
b81872cacd merge from dev-1.3.0 2020-06-19 18:52:30 +08:00
lenboo
73cae7f046 merge from dev-1.3.0 2020-06-19 15:19:32 +08:00
lenboo
714ae33e40 merge from dev 2020-06-19 14:20:24 +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
743294668
a58d1b3b45
Modify OracleDB connection string format. (#2970)
Co-authored-by: taoyuxin <taoyuxin@inspur.com>
2020-06-15 11:12:22 +08:00
Kevin
9fd728908f
remove unused import #2715 (#2718)
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: gabry.wu <8545796+gabrywu@users.noreply.github.com>
2020-06-14 10:27:13 +08:00
simon824
24120a4641 fix the bad code smell 2020-06-12 11:27:42 +08:00
Simon
0b11275880
Merge pull request #2 from apache/dev
merge
2020-06-12 09:22:58 +08:00
lenboo
1904a7022a change 1.3.0 to 1.3.0-snapshot 2020-06-10 11:42:15 +08:00
simon824
fad09075f9 remove fastjson maven dependence 2020-06-10 09:16:28 +08:00
eights
c8f28ab2ba sqoop task optimization 2020-06-09 03:16:35 -07:00
simon824
c5b3f35bd4 replace fastjson annotation 2020-06-09 14:37:16 +08:00
simon824
6e907f150c 1. specified jackson Date format.
2. remove getMapper method,replace with toList()
3. rewrite toList method,support constructCollectionType.
4. parseObject(resp, Map.class) replace to toMap() method
5. rename JacksonSerialize to JsonSerializer

rewrite createArrayNode,createObjectNode method will Affect too many lines ,i will fix it in the next pr.
2020-06-09 13:02:50 +08:00
bao liang
422fe5136d
[license] add license and notice (#2916)
* fix bug: send task result to master until success.

* fix bug: send task result to master until success.

* add sleep

* set null if send result failed

* set null if send result failed

* change max length of username to 39

* test for gc

* change version to 1.3.0

* check and add some license files

* check and add some license files

* revert

Co-authored-by: baoliang <baoliang@analysys.com.cn>
2020-06-06 22:21:37 +08:00
小清
3e7dc7da8d
merge method updateuser if and fix bug#2892
fix [BUG] When editing user information, clear the phone number, the database table t_ds_user.phone is not cleared #2892
2020-06-04 16:26:26 +08:00
simon824
572ee0fc64 Using Jackson instead of Fastjson 2020-06-04 16:23:59 +08:00
simon
6205e687c2 annotation reset 2020-06-04 10:11:11 +08:00
lgcareer
4441d91dcf
Fix bug:If user didn't set the value of tenant,release process definition fail (#2885)
* copy resources need get top directory first

* copy resources need get top directory first

* fix #2860:copy files and create empty directory

* Fix bug:If user didn't set the value of tenant,release process definition online fail
2020-06-03 13:50:06 +08:00
simon
f26e246706 Using Jackson instead of Fastjson 2020-06-02 20:00:49 +08:00
lgcareer
31dca43cdb
fix #2860:copy files and create empty directory (#2876)
* copy resources need get top directory first

* copy resources need get top directory first

* fix #2860:copy files and create empty directory
2020-06-02 18:33:06 +08:00
张世鸣
e386af700d Using Jackson instead of Fastjson 2020-06-02 17:22:39 +08:00
张世鸣
a9f72c2081 Using Jackson instead of Fastjson 2020-06-02 15:54:34 +08:00
lgcareer
6723454df9
copy resources need get top directory first (#2866)
* copy resources need get top directory first

* copy resources need get top directory first
2020-06-01 18:32:06 +08:00
Han Gao
8f8ddae030
Using Jackson instead of Fastjson (#2850)
* Using Jackson instead of Fastjson

* Fix some json bugs

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-05-31 18:11:10 +08:00
GabrielWithTina
d00627ff77
Return ProcessDefinition ID when call ProcessController.createProject. (#2849)
Return Scheduler ID when call SchedulerController.createScheduler.

client need the created object ID to bind the relationship between client system and Dolphinscheduler system.
2020-05-30 17:07:22 +08:00
如梦技术
1c15345442
fix: Improve the security of datasource management (#2844)
Closes 2638

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-05-30 15:03:10 +08:00
Wuv1Up
fbb8ff438a
fix return value of created project (#2804)
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-05-30 12:45:39 +08:00
lgcareer
fadb69b181
When update the data source,the host and port show error (#2821)
* When update the data source,the host and port show error

* update DataSourceServiceTest

* update DataSourceServiceTest

* update DataSourceServiceTest
2020-05-27 15:51:58 +08:00
lgcareer
5b633cf412
fix oracle connect failure (#2812)
* use method getJdbcUrl of parent

* Remove the incorrect print message
2020-05-25 19:46:39 +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
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
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
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