Commit Graph

462 Commits

Author SHA1 Message Date
JinyLeeChina
c386b64500
[Feature][JsonSplit-api] copy of processDefinition (#5740)
* select-by-code of processDefinition

* fix ut

* prcessDefinition copy

Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-07-03 14:10:16 +08:00
JinyLeeChina
57414c4df7
[Feature][JsonSplit-api] merging from dev to json_split_two (#5712)
* [BUG-#5678][Registry]fix registry init node miss (#5686)

* [Improvement][UI] Update the update time after the user information is successfully modified (#5684)

* improve

edit the userinfo success, but the updatetime is not the latest.

* Improved shell task execution result log information, adding process.waitFor() and process.exitValue() information to the original log (#5691)

Co-authored-by: shenglm <shenglm840722@126.com>

* [Feature-#5565][Master Worker-Server] Global Param passed by sense dependencies (#5603)

* add globalParams new plan with varPool

* add unit test

* add python task varPoolParams


Co-authored-by: wangxj <wangxj31>

* Issue robot translation judgment changed to Chinese (#5694)



Co-authored-by: chenxingchun <438044805@qq.com>

* the update function should use post instead of get (#5703)

* enhance form verify (#5696)

* checkState only supports %s not {} (#5711)

* [Fix-5701]When deleting a user, the accessToken associated with the user should also be deleted (#5697)

* update

* fix the codestyle error

* fix the compile error

* support rollback

Co-authored-by: Kirs <acm_master@163.com>
Co-authored-by: kyoty <echohlne@gmail.com>
Co-authored-by: ji04xiaogang <ji04xiaogang@163.com>
Co-authored-by: shenglm <shenglm840722@126.com>
Co-authored-by: wangxj3 <857234426@qq.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
Co-authored-by: chenxingchun <438044805@qq.com>
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-06-29 22:55:01 +08:00
JinyLeeChina
5b6c9b7d43
[Feature][JsonSplit-api] select-by-code of processDefinition (#5687)
* select-by-code of processDefinition

* fix ut

Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-06-25 17:54:07 +08:00
JinyLeeChina
728bd31f73
[Feature][JsonSplit-api] api of project (#5630)
* processDefinition create/update

* fix codeStyle

* fix codeStyle

* fix ut

* api of project

* fix ut

* project update method

Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-06-15 10:52:03 +08:00
Kirs
30c88032d3 [Feature-#3961][Registry]Registry-SPI (#5562)
[Feature#3961]Registry SPI

All the logical structure of the registry must be converted into a tree structure within the system, so some plug-ins must be converted internally, such as ETCD
The registry supports distributed locks.
todo: The specific information about the registration center of the API module needs to be adjusted.
2021-06-15 10:30:26 +08:00
JinyLeeChina
a561a618af
[Feature][JsonSplit-api] api of processDefinition create/update (#5602)
* processDefinition create/update

* fix codeStyle

* fix codeStyle

* fix ut

Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-06-11 09:43:05 +08:00
Shiwen Cheng
a5a0c7c5f8
[Fix-5570][Worker] Fix worker.groups in worker.properties is still commented and improve install scripts and configurations (#5571) 2021-06-02 11:21:01 +08:00
ruanwenjun
f8ecb536b7
[Improvement][Alert] server down will send repetitive message #5525 (#5529)
* [Improvement][Alert] server down will send repetitive message #5525

* add ut
2021-06-01 10:21:46 +08:00
Shiwen Cheng
b537f4eb26
[Improvement][Docker/K8s] Support more configurations and service accesses, reduce the duplication configurations, improve image for python and the compatibility of python home (#5393)
* [Improvement][Docker] Support more configurations and improve image for python

* [Improvement][K8s] Support more configurations, more service accesses, and reduce the duplication configurations

* [Improvement][Python] Improve the compatibility of python home

* [Improvement][Install] Fix install config and install.sh

* [Improvement][Install] Fix workflow ut

* [Improvement][Docker] Optimize docker-swarm/check script

* [Improvement][DB] Update default username and password of database

* Update comments in master/worker.properties

* Specify version for all images

* [Improvement][Docker] Optimize PS1 and WORKDIR

* [Improvement][SQL] Reduce heap size to 64m in create-dolphinscheduler.sh and upgrade-dolphinscheduler.sh

* [Fix-5431][K8s] Fix master and worker cannot get the right address with custom DNS
2021-05-24 00:03:35 +08:00
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
JinyLeeChina
847865fba6
[Feature][JsonSplit] Fix dao ut (#5433)
* update taskParams/add task delayTime/fix conditionType bug

* update codeStyle for merge to dev

* fix process lineage bug

* fix codeStyle for json_split

* Fix dao ut

* Fix dao ut

* codeStyle

* modify postgreSQL

* fix TaskInstanceMapper ut

* fix ProjectMapper ut

* fix ProcessDefinitionDao ut

* datasource

* fix postgreSQL

Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-05-09 13:53:14 +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
71f39fa875
[Improvement][Dao] Database add connection check (#5408) (#5409) 2021-05-06 09:41:44 +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
Shiwen Cheng
0f3eed9d00
[Fix-5386][Alert] Fix ERROR: relation t_ds_plugin_define does not exist (#5387) 2021-04-29 16:17:01 +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
JinyLeeChina
c3558965c1
update taskParams/add task delayTime/fix conditionType bug (#5385)
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-04-26 11:28:35 +08:00
Shiwen Cheng
6b8461e901
Revert "[Improvement][DAO] CreateDolphinScheduler (#5357) (#5358)" (#5383)
This reverts commit b108ac43b8.
2021-04-25 23:29:00 +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
ruanwenjun
b108ac43b8
[Improvement][DAO] CreateDolphinScheduler (#5357) (#5358)
* [Improvement][DAO] Create CreateDolphinScheduler (#5357)

* add ut

* fix code smell
2021-04-23 22:03:47 +08:00
JinyLeeChina
862565a7c7
[Feature][JsonSplit] Fix dependTask bug (#5360)
* update SnowFlake

* update processDefinite from processInstance

* update processDefinite from processInstance

* Fix task logger path

* Fix dependTask bug

Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-04-23 14:23:04 +08:00
Wenjun
5f1fc462c9
[Bug][server-api] copy the node ,the preTasks is error #5261 (#5264) 2021-04-20 15:17:17 +08:00
JinyLeeChina
49b234609a
update SnowFlake (#5321)
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-04-19 23:12:09 +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
fanwq
87588ca9f7
fix bug:delete the user ,the project list of admin will lost the projects of this user #5301 (#5302) 2021-04-16 23:26:31 +08:00
mrproliu
b6453da298
Remove useless table fields (#5284)
Co-authored-by: dalekliuhan <dalekliuhan@didiglobal.com>
2021-04-15 20:15:20 +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
JinyLeeChina
31188ffca0
[Feature][JsonSplit] Fix taskInstance (#5246)
* Fix dependency failure

* Fix taskInstance

* task instance list page

* code review

* fix logger path

Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-04-11 16:52:19 +08:00
wen-hemin
556c37155b
[Feature][JsonSplit] When create the process instance, save the field "locations" and "connects" (#5248)
* fix: dag show bugs

* fix: code format

* fix: code format

* fix: code format

* fix: When create the process instance, save the field "locations" and "connects"

Co-authored-by: wen-hemin <wenhemin@apache.com>
2021-04-10 18:38:10 +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
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
wenjun
f20bb54896
[Improvement][API] Improvement query all project list (#5169) (#5192) 2021-04-01 20:34:49 +08:00
zhuangchong
e53369318b
[Fix-4721][worker]The shell background starts the YARN task scenario, and the kill function is abnormal (#4722)
* fix the shell starts the yarn task in the background

* update StringUtils code style.

* solve code smell.

* add method comment in StringUtils class.

* update AlertGroupMapper code style.

* update AlertGroupMapperTest

* update sql script test.
2021-03-30 22:33: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
wen-hemin
f960eacdcd
[FixBug][Jsonsplit] sql condition bug #4417 (#5171)
* fix: task page, rename "description" to "desc"

* fix: The default value of field dependence is null.

* fix: frontend compile check

* fix: When create process, the version button is set to unavailable

* fix: sql condition bug

Co-authored-by: wen-hemin <wenhemin@apache.com>
2021-03-29 22:17:28 +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
3c9b214da7
[Feature][jsonsplit]add ProcessServiceTest (#5097)
* 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
2021-03-24 15:14:22 +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
Kirs
f109a758f8
[Bug][PGSQL] Delete the stopped workflow without deleting the correspon… (#5066)
* [Bug][Api] Delete the stopped workflow without deleting the corresponding sub process, the workflow instance name is not displayed in the sub process

* fix ut

* fix ut err

* sql style

* fix error
2021-03-23 11:26:11 +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