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
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
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
wanghong1314
e12a26289b
【BUG-5328】 modify process contain depend task is always running ( #5344 )
...
Co-authored-by: wanghong1314 <wanghong1@onething.net>
2021-04-21 22:29:53 +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
luoyuan
513eb76919
[Improvement-5147][Service]This judgment always returns true ( #5156 )
...
* this expression which always evaluates "true"
* delete unused variables
* LogClientService add AutoCloseable
* reformat code
* reformat code
* reformat code
* add log in ProcessService
* reformat code
* Optimize the code
* Optimize the code
* [improvement]modify all methods that refer to LogClientService in the code.
* delete unused code
2021-04-19 17:48:09 +08:00
QuakeWang
5ef1f731b7
Update PeerTaskInstancePriorityQueueTest.java ( #5314 )
...
change `TaskInstance taskInstanceMediumPriority = createTaskInstance("high", Priority.MEDIUM);` to `TaskInstance taskInstanceMediumPriority = createTaskInstance("medium", Priority.MEDIUM);`
2021-04-19 09:48:43 +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
wangxj3
6dbbf6d55d
fix bug of If start a process instance form fail node or stop node ,the param will be init. ( #5267 )
...
Co-authored-by: wangxj <wangxj31>
2021-04-16 23:14:22 +08:00
wenjun
f3dfaacca2
[Improvement][Service] Optimize query log ( #5205 )
...
* [Improvement][Service] Optimize query log
* remove IPUtils
2021-04-15 20:25:01 +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
Bruce Lau
3e64f43138
[Test-4124][service] Add the testCreateCommand test of ProcessService Class ( #5257 )
...
* [uint test] Improve code test coverage of ProcessService class
* [Test-4124][service] Add the testCreateCommand test of ProcessService Class
Co-authored-by: liuziying <liuziying@longfor.com>
2021-04-12 18:55:00 +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
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
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
JinyLeeChina
dd36da8d1f
[Feature][JsonSplit] fix process bug ( #5193 )
...
* transform taskCode from long to string
* fix process bug
* code review
* code review
* code review
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-04-01 17:45:44 +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
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
wen-hemin
e53367bdcc
[Feature][JsonSplit] task page, rename field "description" to "desc" ( #5137 )
...
* fix: task page, rename "description" to "desc"
* fix: The default value of field dependence is null.
* fix: frontend compile check
Co-authored-by: wen-hemin <wenhemin@apache.com>
2021-03-24 15:05:54 +08:00
JinyLeeChina
1eaf1f6234
[Feature][JsonSplit] fix taskId in processDefinitionJson ( #5136 )
...
* 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
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-03-24 11:44:14 +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
zhuangchong
ba039dc252
[Improvement][dao] Resource features SQL slow query optimization. ( #4947 )
...
* Resourse features SQL slow query optimization.
* update resource mapper queryResourcePaging method.
* split resource and resource_uesr sql statement.
* determine the size of the collection.
* update process service class code style.
* update ResourceUserMapper java class code style.
* add resourceUserMapper in the test config file.
* solve code smell
* split paging query join statement.
* update ResourceUserMapper class.
* remove sql join statement.
* update resource test class code style.
* update ResourcesServiceTest test class.
* rerun ut.
* update user service test class.
* solve query resource list method code smell.
2021-03-20 12:50:26 +08:00
wangxj3
29d42fd92d
[Feature-#3805][server-master] Task parameter transfer ( #5077 )
...
* fix out param format bug
Co-authored-by: wangxj <wangxj31>
2021-03-18 11:50:10 +08:00
Shiwen Cheng
5856a12855
[Improvement-4984][Worker] Refactor and Improve worker load balance ( #4996 )
...
* [Improvement][Remote] Improve unit tests
* [Improvement][Worker] Improve worker load balance
* [Improvement][Worker] Fix code smells
* [Improvement][Worker] Rename weight to hostWeight
2021-03-18 10:03:58 +08:00
Ts686
6216817861
[Improvement-4971][alert|dao|service]Remove redundant PropertyUtils.class ( #5020 )
...
* [Improvement][alert|dao|service]
1. Remove redundant PropertyUtils.class (#4971 )
2. Remove useless import package.
* [Improvement][alert|dao|service]
1. Remove redundant PropertyUtils.class (#4971 )
2. Remove useless import package.
* [Improvement][alert|dao|service]
1. Remove redundant PropertyUtils.class (#4971 )
2. Remove useless import package.
* [Improvement][alert|dao|service]
1. Remove redundant PropertyUtils.class (#4971 )
2. Remove useless import package.
2021-03-17 15:28:07 +08:00
JinyLeeChina
d98c2c5cfe
[Feature][JsonSplit] Fix bug in interface of queryProcessDefinitionList ( #5043 )
...
* 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
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-03-16 15:44:03 +08:00
lenboo
a574d2e38c
Merge remote-tracking branch 'upstream/dev' into spilit
2021-03-12 10:44:43 +08:00
Shiwen Cheng
ae608e024a
[Fix-5037][Server] Fix that both the master and the worker is hanging after restarting and stopping ( #5038 )
...
* [Fix-5037][Server] Fix that both the master and the worker is hanging after restarting and stopping
* [Improvement][*] Replace commons.lang.StringUtils with common.utils.StringUtils
2021-03-12 09:33:30 +08:00
wenjun
ea6b1de120
[Improvement][worker] Optimize KillYarnJob (4939) ( #4943 )
2021-03-11 22:13:44 +08:00
JinyLeeChina
c010ac1f1d
[Feature][JsonSplit] Fix logical bug in saving process definition ( #5009 )
...
* modify checkDAGRing and ProcessService method
* modify process instance for project home page
* fix save process bug
* Fix logical bug in saving process definition
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-03-09 12:54:25 +08:00
JinyLeeChina
7f0678d3be
[Feature][JsonSplit] Fix save process bug ( #5001 )
...
* modify checkDAGRing and ProcessService method
* merge
* modify dagRing
* modify process instance for project home page
* fix save process bug
* codeStyle
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-03-08 17:01:02 +08:00
Simon
6111f05250
[Feature][jsonspilt]fix ProcessInstanceMapperTest ( #4989 )
...
* 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
2021-03-08 10:22:36 +08:00
bao liang
5e2b97b573
[feature-4417][JsonSplit]refactor json in process instance and process definition ( #4993 )
...
* remove the use of json
* remove json in process definition and process instance
2021-03-08 08:44:34 +08:00
JinyLeeChina
39a9c0c392
[Feature][jsonspilt]modify process instance for project home page ( #4991 )
...
* modify checkDAGRing and ProcessService method
* merge
* modify dagRing
* modify process instance for project home page
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-03-07 18:12:01 +08:00
Simon
f24ecff840
[Feature][jsonsplit]add mapper module ut and some bugfix ( #4957 )
...
* 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
2021-03-06 14:25:00 +08:00
lenboo
5bda7c344c
Merge remote-tracking branch 'upstream/dev' into spilit
2021-03-05 22:11:55 +08:00
Shiwen Cheng
8c68e2c60b
[Fix][Worker] Fix worker cannot start and alertClientService NullPointerException ( #4956 )
...
* [Fix][Worker] Fix worker cannot start
* [Fix][Worker] Fix alertClientService NullPointerException
* [Fix][Worker] Improve ut coverage
* [Improvement][CI] Improve workflow ci
2021-03-05 09:50:49 +08:00
JinyLeeChina
779596cf05
[Feature][JsonSplit] modify checkDAGRing and ProcessService method ( #4931 )
...
* modify checkDAGRing and ProcessService method
* merge
* modify dagRing
Co-authored-by: JinyLeeChina <297062848@qq.com>
2021-03-04 10:22:14 +08:00
