lenboo
6ef54ebe9b
Merge remote-tracking branch 'upstream/dev' into spilit
4 years ago
Shiwen Cheng
beb5adb985
[Feature][MR] Support mapreduce name ( #5029 )
4 years ago
JuFeng Li
3769066803
[Fix-5032][Alert]Support email multiple format ( #5033 )
...
* support multilple email format
Co-authored-by: 李巨丰 <lijf@2345.com>
4 years ago
lenboo
461e6334ae
Merge remote-tracking branch 'upstream/dev' into spilit
4 years ago
fredster33
9a3ae48396
Update PULL_REQUEST_TEMPLATE.md ( #5022 )
...
When commented out, even if the PR creator forgets to remove the tips, they will not appear in the PR when it is submitted.
4 years ago
fredster33
3197b321a1
Grammar changes for README ( #5021 )
4 years ago
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
4 years ago
dddyszy
28dfde7002
[Fix-4862][Server] Kill yarn application command won't be execute whe… ( #4936 )
...
* [Fix-4862][Server] Kill yarn application command won't be execute when kill error
4 years ago
wenjun
fd4b59ad6c
[Improvement][Worker] Rename worker.weight to worker.host.weight ( #4997 ) ( #5014 )
4 years ago
lenboo
81dcd6873d
Merge remote-tracking branch 'upstream/dev' into spilit
4 years ago
Simon
40bcb2e818
[Feature][jsonsplit]fix TaskInstanceMapperTest ( #5010 )
...
* fix TaskInstanceMapperTest
4 years ago
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>
4 years ago
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
4 years ago
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
4 years ago
zhuangchong
d13fab7497
fix mybatis mapper sql judgment condition of foreach statement. ( #4964 )
4 years ago
chengshiwen
a2aeeb7dab
[Improvement][Docker] Add tenant tip for quick start
4 years ago
wenjun
89c9b51740
[Improvement]Add comments to ZKMasterClient.java( #5005 )
4 years ago
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
4 years ago
chengshiwen
6d2ae7523f
[Improvement][K8s] Optimize metadata name
4 years ago
chengshiwen
167a768b32
[Improvement][K8s] Optimize fullname
4 years ago
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>
4 years ago
chengshiwen
b689630970
[Improvement][K8s] Optimize image pull secret
4 years ago
chengshiwen
e20ffacf22
[Improvement][K8s] Support local image
4 years ago
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
4 years ago
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
4 years ago
chengshiwen
d3afa1f93e
[Improvement][Docker] Support docker compose file 3.1+ version
4 years ago
lenboo
eeaa495661
Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into spilit
4 years ago
lenboo
bb7106d100
Merge remote-tracking branch 'upstream/dev' into spilit
4 years ago
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
4 years ago
Shiwen Cheng
71bd231c95
[Improvement][UI] Unify form model by m-list-box ( #4982 )
4 years ago
zhuangchong
e68e994d46
when Kerberos authentication is enabled,cannot get application status. ( #4980 )
4 years ago
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
4 years ago
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>
4 years ago
lenboo
ce6338b353
Merge remote-tracking branch 'upstream/dev' into spilit
4 years ago
zhuangchong
86600d1328
AlertClientService null pointer exception in SqlTask. ( #4983 )
4 years ago
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
4 years ago
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
4 years ago
chengshiwen
467d9f5681
[Fix-3124][Docker] Fix that can not build a docker image on Windows
4 years ago
lenboo
5bda7c344c
Merge remote-tracking branch 'upstream/dev' into spilit
4 years ago
Shiwen Cheng
8112f5bcb5
[Fix][API] Fix KeeperException ( #4961 )
...
fix #4705
4 years ago
xingchun-chen
e851ec1367
Merge pull request #4962 from chengshiwen/improve-docker-readme
...
[Improvement][Docker] Improve readme, notes, and long host display
4 years ago
chengshiwen
fb2b55c150
[Improvement][Docker] Improve readme, notes, and long host display
4 years ago
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
4 years ago
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
4 years ago
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
4 years ago
xingchun-chen
6d1537aa44
Merge pull request #4945 from CalvinKirs/e2e_test
...
[CI][e2e]close e2e test
4 years ago
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
4 years ago
CalvinKirs
55389c0fb0
close e2e test
4 years ago
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>
4 years ago
xingchun-chen
cf13c87dae
Merge pull request #4900 from chengshiwen/improve-docker-supervisor-and-log
...
[Fix-4897][Docker] Support supervisor management and fix log stdout
4 years ago