Commit Graph

656 Commits

Author SHA1 Message Date
zhuangchong
1b7dcea610
[Improvement-5440][Maven] Project module maven dependency optimization (#5441)
* Optimize dependencies between modules.

* update module-alert dependency.

* add repository in the pom xml.

* update Central Repository in the pom.xml.
2021-05-19 10:05:00 +08:00
Yao WANG
bc22ae7c91
[Improvement][Task] Remove deprecated TaskRecordDao and simply the after() method in the AbstractTask class (#5492)
* remove the depreated data quality module

* fix lint

Co-authored-by: Yao <ywang46@paypal.com>
2021-05-18 17:00:03 +08:00
ruanwenjun
a925f64571
[Feature][api] schedule add timezone support #5259 (#5465)
* [Feature][api] schedule add timezone support #5259

* import moment-timezone

* fix code smell
2021-05-17 21:08:20 +08:00
ruanwenjun
68301db6b9
[Improvement][Api] Upload resource to remote failed, the local tmp file need to be cleared #5475 (#5476) 2021-05-17 11:13:14 +08:00
baoliang
7aa8b518ac Merge remote-tracking branch 'upstream/dev' into json_split
# Conflicts:
#	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
#	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/DependentExecute.java
2021-05-11 13:55:27 +08:00
JinyLeeChina
515fa4912e
[Feature][JsonSplit] Fix ProcessService ut (#5435)
* Fix ProcessService ut

* codeStyle

* Fix AlertPlugin ut

* Fix AlertPlugin ut

* Fix server module ut

* Fix server module ut

* Fix api ut

* codeStyle

Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-05-10 23:17:56 +08:00
JinyLeeChina
363426de71
[Feature][JsonSplit] fix process lineage bug (#5418)
* update taskParams/add task delayTime/fix conditionType bug

* update codeStyle for merge to dev

* fix process lineage bug

Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-05-07 16:37:49 +08:00
baoliang
b594afc94c Merge remote-tracking branch 'upstream/dev' into json_split
# Conflicts:
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
#	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/procedure/ProcedureTask.java
2021-05-07 01:38:31 +08:00
ruanwenjun
0bdf15efb9
[Improvement][DAO] Add Unique key in t_ds_alertgroup and t_ds_datasource (#5373)
* [Improvement][DAO] Add Unique key to t_ds_worker_group t_ds_datasource

* Add exception catch

* add ddl

* fix ut
2021-05-06 09:32:28 +08:00
Hayden Zhou
2114b63216
replace access log by AccessLogAnnotation (#5315)
* replace access log by AccessLogAnnotaion

* fix codesytle error

* fix RequestContextHolder.getRequestAttributes may be null

* fix code style

* accessLogAnnotation addd ignore params

* fix style

* reduce code smells

* fix code style

* fix logtext if request is ignore

* add trance id

* fix code style

* add comment

* optimize

* fix code style

* fix code

Co-authored-by: hayden <hayden@haydendeMacBook-Pro.local>
2021-05-04 22:40:46 +08:00
ruanwenjun
cbbe9c333c
[Improvement][api-server] Update the project owner (#5394)
* [Bug][api-server] delete the user ,when query the project by join the table of t_ds_user will return null. (#5326)

* when delete a user, do project ownership check

* fix ut

* fix vulnerability
2021-04-29 14:50:05 +08:00
JinyLeeChina
2a44cb9de6
[Feature][JsonSplit] update codeStyle for merge to dev (#5392)
* update taskParams/add task delayTime/fix conditionType bug

* update codeStyle for merge to dev

Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-04-26 22:30:35 +08:00
baoliang
746d9eca1d Merge remote-tracking branch 'upstream/dev' into json_split
# Conflicts:
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionVersionServiceImpl.java
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
#	dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java
#	dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionVersionServiceTest.java
#	dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNode.java
#	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java
#	dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/processdure/ProcedureTask.java
#	dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
2021-04-26 14:14:05 +08:00
wen-hemin
fd54dc0ce2
[FixBug][JsonSplit] depend task, the field "process definition id" modify to "process definition code" (#5377)
* fix: depend task, the field "process definition id" modify to "process definition code"

* fix: depend task, the field "process definition id" modify to "process definition code"

Co-authored-by: wen-hemin <wenhemin@apache.com>
2021-04-25 19:36:36 +08:00
ruanwenjun
e6d8da484f
[Improvement][API] Create Datasource #5083 (#5116)
* [Improvement][API] Create Datasource #5083

  * Refact create/ update datasource API

* fix Code Smells

* fix code smell

* resolve code smell

* use ConnectionParam to replace BaseDatasource

* solve license

* add ut

* code check

* add ut

* fix ut coverage

* fix ut
2021-04-25 13:51:59 +08:00
Shiwen Cheng
2e1d6975fd
[Improvement][Build] Optimize long release name and remove unused nginx release and upgrade spring boot version (#5308)
* [Build] Optimize long release name and remove unused nginx release

* [Build] Upgrade spring boot version

* [Improvement] Improve code style
2021-04-25 09:55:38 +08:00
JinyLeeChina
db96bf2dfe
[Feature][JsonSplit] Fix batchMove of processDefinition bug (#5371)
* update SnowFlake

* update processDefinite from processInstance

* update processDefinite from processInstance

* Fix task logger path

* Fix dependTask bug

* Fix batchMove of processDefinition bug

* codeStyle

Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-04-24 15:33:23 +08:00
luoyuan
e57ee658e8
[Improvement] Optimized close of IO (#5336)
* [improvement]modify all methods that refer to LogClientService in the code.

* delete unused code

* [Improvement] Optimized close of IO
2021-04-21 22:47:16 +08:00
Simon
37b149da39
fix circular dependence bug (#5330) 2021-04-21 09:40:21 +08:00
JinyLeeChina
d60f31bcf3
[Feature][JsonSplit] update processDefinite from processInstance (#5325)
* update SnowFlake

* update processDefinite from processInstance

* update processDefinite from processInstance

Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-04-20 15:33:37 +08:00
JinyLeeChina
49b234609a
update SnowFlake (#5321)
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-04-19 23:12:09 +08:00
wen-hemin
2a81b29b8f
fix: process instance version page bug (#5319)
Co-authored-by: wen-hemin <wenhemin@apache.com>
2021-04-19 16:22:17 +08:00
zhuangchong
fe144e46a3
[Improvement-4898][API] the paging query interface validates page params (#4899)
* fix api list-paging method check page params.

* update process definition version class check page params.

* add ProcessInstanceControllerTest in the pom xml file.

* solve sonar exception.

* add project controller test class.

* update create project return result

* update project controller test class code style.

* update sonar problem.

* update QueueController test class.
2021-04-19 11:01:52 +08:00
JinyLeeChina
f7a06a033d
[Feature][JsonSplit] Fix master/worker about shellTask (#5300)
* Fix quoted bug about processDefineId of processInstance

* Fix master/worker about shellTask

* codeStyle

* codeStyle

* update taskType

* codeStyle

* update timeoutNotifyStrategy

* codeStyle

Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-04-18 12:45:30 +08:00
wen-hemin
784b3550b2
fix: The instance page DAG does not display bug (#5298)
Co-authored-by: wen-hemin <wenhemin@apache.com>
2021-04-18 12:43:47 +08:00
wenjun
7843ed4087
[Improvement][ApiServer] Traffic limit #5235 (#5307)
* [Improvement][ApiServer] Traffic limit #5235

* code style check
2021-04-16 22:41:02 +08:00
Shiwen Cheng
1c1f6663a6
[Improvement][WorkerGroup] Optimize and reduce database and zookeeper queries and replace worker address input with multiple-select (#5182)
* [Improvement][Server] Optimize and reduce database and ZooKeeper query

* [Improvement][WorkerGroup] Replace worker address input with multiple-select

* [Improvement][WorkerGroup] Fix unit test

* [Improvement][API&UI] Optimize long host to short host and long host display in k8s
2021-04-14 21:39:39 +08:00
baoliang
0166aebf71 Merge remote-tracking branch 'upstream/dev' into json_split
# Conflicts:
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/enums/Status.java
#	dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/utils/StringUtils.java
#	dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.java
#	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
#	dolphinscheduler-service/src/test/java/org/apache/dolphinscheduler/service/process/ProcessServiceTest.java
2021-04-13 23:10:19 +08:00
JinyLeeChina
645847c096
Fix quoted bug about processDefineId of processInstance (#5263)
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-04-13 22:47:36 +08:00
wenjun
039d517c13
[Improvement][API] the QueryAuthorizedProject interface adds permission judgment (#5170) (#5184) 2021-04-11 14:44:20 +08:00
Jonathan.Wei
d4812f0a34
[Fix-5250][API] Fixed data source parameter type attribute being null (#5251)
* Update DataSourceServiceImpl.java

Fixed data source parameter type attribute being null

* Fixed test case issues related to deleting the type parameter

Co-authored-by: 魏基勇 <weijiyong@ky-tech.com.cn>
2021-04-11 13:26:27 +08:00
wenjun
641dedd21e
fix dag empty msg (#5245) 2021-04-10 13:44:36 +08:00
wangxj3
5c898e38ed
[FIX-#5233][API] Fix bug ofREPEAT RUNNING processInstance throw exceprion (#5234)
* fix bug of REPEAT RUNNING throw exception

Co-authored-by: wangxj <wangxj31>
2021-04-08 18:58:43 +08:00
wen-hemin
cc82a98f50
[FixBug][JsonSplit] dag show bugs (#5226)
* fix: dag show bugs

* fix: code format

* fix: code format

* fix: code format

Co-authored-by: wen-hemin <wenhemin@apache.com>
2021-04-08 14:18:01 +08:00
Simon
8d6c2e3a6c
fix copy locations name error (#5228) 2021-04-07 17:17:51 +08:00
JinyLeeChina
a8f2894b79
[Feature][JsonSplit] Fix master/processInstance bug (#5206)
* transform taskCode from long to string

* fix process bug

* code review

* code review

* code review

* Fix master/processInstance bug

Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-04-04 11:26:42 +08:00
bao liang
86ce8f133a
[JsonSplit-4417][master/worker/api]json split- remove json in task instance. (#5160)
* [json split] refactor json in task instance

* add task_pramas in task_instance

* feature #4417 refactor json split in task instance

* code style

* code style

* code style

* code style

* code style

* update

* update

* update unit test

* update
2021-04-03 17:58:04 +08:00
Hayden Zhou
5d7dc1cb2a
[Improvement][API]optimize tenant code validation (#5093)
* optimize tenant code validation

* fix code style and test err

* fix test error, and remove duplicate tenant code validate
2021-04-01 20:50:14 +08:00
guohaozhang
6b565f0aed
[Fix-#5124] fix change fileName when reupload file (#5125) 2021-04-01 20:44:03 +08:00
wenjun
f20bb54896
[Improvement][API] Improvement query all project list (#5169) (#5192) 2021-04-01 20:34:49 +08:00
JinyLeeChina
689106d114
transform taskCode from long to string (#5174)
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-03-30 11:07:28 +08:00
JinyLeeChina
a467fffd7b
[Feature][JsonSplit] fix taskId in json (#5165)
* modify checkDAGRing and ProcessService method

* merge

* modify dagRing

* modify process instance for project home page

* fix save process bug

* codeStyle

* Fix logical bug in saving process definition

* codeSytle

* Fix bug in interface of  queryProcessDefinitionList

* codeSytle

* Fix api bug"

* fix taskId in processDefinitionJson

* fix json taskId

* codeStyle

Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-03-29 14:22:40 +08:00
lenboo
0914699fc5 Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into spilit 2021-03-26 00:06:26 +08:00
lenboo
f05ba84968 Merge remote-tracking branch 'upstream/dev' into spilit
# Conflicts:
#	dolphinscheduler-dao/src/main/java/org/apache/dolphinscheduler/dao/mapper/ProcessInstanceMapper.java
#	dolphinscheduler-dao/src/test/java/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapperTest.java
2021-03-25 23:54:01 +08:00
Simon
cd19507271
[feature][jsonsplit]fix copy/export/import processDefinition bugs (#5146)
* Modify Project and ProjectUser Mapper

* Modify Project and ProjectUser Mapper

* project_code is bigint(20)

* modify ERROR name

* modify saveProcessDefine, remove the duplicate code with createTaskAndRelation

* modify import/export processdefinition, add genProcessData

* fix ut and bug

* code style

* repalce project_id with code

* conflicts solve

* conflicts solve

* conflicts solve

* bugfix

* modify listResources mothod and remove getResourceIds mothod

* 1

* conflicts solve

* modify listResources mothod and remove getResourceIds mothod

* modify listResources mothod and remove getResourceIds mothod

* replace processDefinitionVersion with processDefinitionLog

* codestyle

* codestyle

* add mapper module ut

* codestyle

* fix ProcessInstanceMapperTest

* codestyle

* conflicts solve

* conflicts solve

* conflicts solve

* conflicts solve

* conflicts solve

* fix ProcessInstanceMapperTest

* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest

* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest

* fix TaskInstanceMapperTest

* add TaskDefinitionLogMapperTest/TaskDefinitionMapperTest and bugfix

* codestyle

* codestyle

* Refactor process lineage

* Refactor process lineage

* codestyle

* codestyle

* Refactor process lineage

* Refactor process lineage

* add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest

* add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest

* add ProcessServiceTest

* 1

* 1

* fix copy/export/import processDefinition bugs

* 1

* codestyle
2021-03-25 18:27:47 +08:00
Simon
21b7b77d50
[Feature][JsonSplit]fix modifyBy field (#5112)
* Modify Project and ProjectUser Mapper

* Modify Project and ProjectUser Mapper

* project_code is bigint(20)

* modify ERROR name

* modify saveProcessDefine, remove the duplicate code with createTaskAndRelation

* modify import/export processdefinition, add genProcessData

* fix ut and bug

* code style

* repalce project_id with code

* conflicts solve

* conflicts solve

* conflicts solve

* bugfix

* modify listResources mothod and remove getResourceIds mothod

* 1

* conflicts solve

* modify listResources mothod and remove getResourceIds mothod

* modify listResources mothod and remove getResourceIds mothod

* replace processDefinitionVersion with processDefinitionLog

* codestyle

* codestyle

* add mapper module ut

* codestyle

* fix ProcessInstanceMapperTest

* codestyle

* conflicts solve

* conflicts solve

* conflicts solve

* conflicts solve

* conflicts solve

* fix ProcessInstanceMapperTest

* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest

* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest

* fix TaskInstanceMapperTest

* add TaskDefinitionLogMapperTest/TaskDefinitionMapperTest and bugfix

* codestyle

* codestyle

* Refactor process lineage

* Refactor process lineage

* codestyle

* codestyle

* Refactor process lineage

* Refactor process lineage

* add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest

* add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest

* add ProcessServiceTest

* 1

* 1

* fix modifyBy field

* 1

* ut fix
2021-03-24 14:54:34 +08:00
wenjun
5d264c9f20
[Improvement][Api] Optimize query processInstanceList #5134 (#5135)
* Batch query user rather than several query
2021-03-23 23:48:13 +08:00
Shiwen Cheng
0d065c0712
[Feature-5062][*] Create/Edit/Delete Worker Group in Web UI (#5113)
* [Improvement][Server] Rename MASTER_PREFIX to MASTER_TYPE and WORKER_PREFIX to WORKER_TYPE

* [Feature][Api&Dao] Support api and dao of worker group

* [Feature][UI] Support to create, edit and delete worker group

* [Feature][API&UI] Support work groups from database and zookeeper to display together in worker group management

* [Feature][API&Dao] Support long ip list and check request parameters when saving worker group

* [Feature][*] Refactor ipList to addrList

* [Feature][Server] Support host manager to select worker host by worker group in database

* [Improvement][Server] Improve the config of master and worker

* [Improvement][*] Rename zkRegistered to systemDefault

* [Improvement][Test] Fix unit test and improve ui

* [Improvement][Server] Improve getServerMaps

Co-authored-by: dailidong <dailidong66@gmail.com>
2021-03-23 23:47:41 +08:00
JinyLeeChina
d99934d0da
[Feature][JsonSplit] Fix api bug (#5102)
* modify checkDAGRing and ProcessService method

* merge

* modify dagRing

* modify process instance for project home page

* fix save process bug

* codeStyle

* Fix logical bug in saving process definition

* codeSytle

* Fix bug in interface of  queryProcessDefinitionList

* codeSytle

* Fix api bug"

Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-03-23 10:44:25 +08:00
lenboo
010b49c933 merge from dev 2021-03-22 15:18:16 +08:00