Simon
c4d9ceffd1
[Feature][jsonsplit]add TaskDefinitionLogMapperTest/TaskDefinitionMapperTest and bugfix ( #5012 )
...
* 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
2021-03-10 10:50:49 +08:00
lenboo
81dcd6873d
Merge remote-tracking branch 'upstream/dev' into spilit
2021-03-09 18:19:08 +08:00
Simon
40bcb2e818
[Feature][jsonsplit]fix TaskInstanceMapperTest ( #5010 )
...
* fix TaskInstanceMapperTest
2021-03-09 12:55:56 +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
Shiwen Cheng
e74932cfc2
[Feature-4960][Spark] Add name input for Spark and improve Spark & MR args ( #4959 )
...
* [Improvement][Spark] Improve spark args and add name input
* [Improvement][MR] Improve map reduce args
* [Improvement][Spark] Fix check style
* [Improvement][Spark] Fix check style for spark, flink and mr
2021-03-09 12:51:35 +08:00
xingchun-chen
0ac0f31548
Merge pull request #5002 from chengshiwen/improve-docker-compatibility
...
[Improvement-4837][Docker] Support docker compose file 3.1+ version and Optimize k8s template
2021-03-09 10:06:19 +08:00
zhuangchong
d13fab7497
fix mybatis mapper sql judgment condition of foreach statement. ( #4964 )
2021-03-09 09:44:11 +08:00
chengshiwen
a2aeeb7dab
[Improvement][Docker] Add tenant tip for quick start
2021-03-08 23:37:24 +08:00
wenjun
89c9b51740
[Improvement]Add comments to ZKMasterClient.java( #5005 )
2021-03-08 21:47:02 +08:00
guohaozhang
c3f43a1924
[Improvement-#4972] add kerberos init before yarn kill ( #4973 )
...
* [Improvement-#4972] add kerberos init before yarn kill
* [Improvement-#4972] fix code smell
* [Improvement-#4972] add ut
2021-03-08 20:17:28 +08:00
chengshiwen
6d2ae7523f
[Improvement][K8s] Optimize metadata name
2021-03-08 19:08:20 +08:00
chengshiwen
167a768b32
[Improvement][K8s] Optimize fullname
2021-03-08 17:27:27 +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
chengshiwen
b689630970
[Improvement][K8s] Optimize image pull secret
2021-03-08 16:25:24 +08:00
chengshiwen
e20ffacf22
[Improvement][K8s] Support local image
2021-03-08 16:11:59 +08:00
xingchun-chen
fd581af726
Merge pull request #4977 from chengshiwen/fix-docker-image-build-on-windows
...
[Fix-3124][Docker] Fix that can not build a docker image on Windows
2021-03-08 15:56:35 +08:00
Simon
ab18ca0acb
[Feature][jsonsplit]fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest ( #5000 )
...
* 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
2021-03-08 14:36:52 +08:00
chengshiwen
d3afa1f93e
[Improvement][Docker] Support docker compose file 3.1+ version
2021-03-08 12:58:17 +08:00
lenboo
eeaa495661
Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into spilit
2021-03-08 10:53:02 +08:00
lenboo
bb7106d100
Merge remote-tracking branch 'upstream/dev' into spilit
2021-03-08 10:23:16 +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
Shiwen Cheng
71bd231c95
[Improvement][UI] Unify form model by m-list-box ( #4982 )
2021-03-08 08:58:38 +08:00
zhuangchong
e68e994d46
when Kerberos authentication is enabled,cannot get application status. ( #4980 )
2021-03-08 08:54:03 +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
lenboo
ce6338b353
Merge remote-tracking branch 'upstream/dev' into spilit
2021-03-07 08:59:36 +08:00
zhuangchong
86600d1328
AlertClientService null pointer exception in SqlTask. ( #4983 )
2021-03-06 17:45:38 +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
Simon
bd4b2f85a9
[Feature][jsonsplit]add ProcessTaskRelationServiceImplTest/TaskDefinitionServiceImplTest ( #4949 )
...
* 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 ProcessTaskRelationServiceImplTest/TaskDefinitionServiceImplTest
* conflicts solve
* conflicts solve
* conflicts solve
* add ProcessTaskRelationServiceImplTest/TaskDefinitionServiceImplTest
* codestyle
2021-03-06 10:56:49 +08:00
chengshiwen
467d9f5681
[Fix-3124][Docker] Fix that can not build a docker image on Windows
2021-03-05 23:40:12 +08:00
lenboo
5bda7c344c
Merge remote-tracking branch 'upstream/dev' into spilit
2021-03-05 22:11:55 +08:00
Shiwen Cheng
8112f5bcb5
[Fix][API] Fix KeeperException ( #4961 )
...
fix #4705
2021-03-05 21:34:54 +08:00
xingchun-chen
e851ec1367
Merge pull request #4962 from chengshiwen/improve-docker-readme
...
[Improvement][Docker] Improve readme, notes, and long host display
2021-03-05 15:50:10 +08:00
chengshiwen
fb2b55c150
[Improvement][Docker] Improve readme, notes, and long host display
2021-03-05 15:15:23 +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
dddyszy
01b71f1a0d
[Fix-4839][Server] Process cannot stop when killed with retry ( #4841 )
...
* [Fix-4839][Server] Process cannot stop when killed with retry
* [Fix-4839][Server] Process cannot stop when killed with retry
2021-03-04 21:10:11 +08:00
Simon
8b35e21390
[Feature][jsonsplit] replace processDefinitionVersion with processDefinitionLog ( #4942 )
...
* Modify Project and ProjectUser Mapper
* project_code is bigint(20)
* modify saveProcessDefine, remove the duplicate code with createTaskAndRelation
* modify import/export processdefinition, add genProcessData
* 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
2021-03-04 12:57:10 +08:00
xingchun-chen
6d1537aa44
Merge pull request #4945 from CalvinKirs/e2e_test
...
[CI][e2e]close e2e test
2021-03-04 11:24:10 +08:00
xingchun-chen
969fba8afd
Merge pull request #4783 from chengshiwen/improve-k8s-adapt-alert-server
...
[Improvement][K8s] Adapt to the latest alert-server with updated config and port 50052
2021-03-04 11:23:29 +08:00
CalvinKirs
55389c0fb0
close e2e test
2021-03-04 11:01:26 +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
xingchun-chen
cf13c87dae
Merge pull request #4900 from chengshiwen/improve-docker-supervisor-and-log
...
[Fix-4897][Docker] Support supervisor management and fix log stdout
2021-03-04 10:08:03 +08:00
Shiwen Cheng
d667525913
[Fix-4905][K8s] Fix incorrect host problem in minikube ( #4906 )
...
* [Fix][K8s] Fix incorrect host problem in minikube
* [Improvement][K8s] Rename MASTER_WORKER_STS_PATTERN to STS_PATTERN
2021-03-04 10:05:24 +08:00
xingchun-chen
4706de717c
Merge pull request #4902 from chengshiwen/improve-k8s-compatibility
...
[Improvement][K8s] Check compatibility in all Kubernetes 1.12+ and optimize ingress compatibility
2021-03-04 09:40:28 +08:00
Shiwen Cheng
24fda3fbb1
[Feature][Flink] Support parallelism input ( #4937 )
...
* [Feature][Flink] Support parallelism input
* [Feature][Flink] Fix check style
* [Feature][Flink] Remove FLINK_DETACH
2021-03-03 21:15:20 +08:00
zhuangchong
e5fb79b433
the instance page duration field content added empty filter processing. ( #4938 )
2021-03-03 20:38:14 +08:00
JuFeng Li
658a7f5661
[Fix-4940][UI]Fix when upload a file to directory call resources/list-paging error ( #4941 )
...
* fix resource page call list-page error
Co-authored-by: 李巨丰 <lijf@2345.com>
2021-03-03 20:37:35 +08:00
JuFeng Li
53aedc50ec
[Fix-4934][UI] Fix task statics info bug ( #4935 )
...
* ui statics info bug fix
Co-authored-by: 李巨丰 <lijf@2345.com>
2021-03-03 20:36:41 +08:00
lenboo
dcf97920aa
merge from dev 2021-03-03
2021-03-03 10:44:12 +08:00
Simon
0c2b065db0
[Feature][jsonsplit]modify listResources mothod and remove getResourceIds mothod ( #4928 )
...
* 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
2021-03-03 10:29:27 +08:00
