Commit Graph

4780 Commits

Author SHA1 Message Date
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
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
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
zhuangchong
5bfe3fca67
[Fix][SqlTask] fix hive sqltask invalid connection parameters. (#4917)
* fix hive sqltask invalid connection parameters.

* add setConnParams test method.

* update base datasource test class code style.

* add BaseDataSourceTest in the pom xml.

* update hive conf list jdbc url stitching.

* update hive datasource test class.
2021-03-03 09:15:37 +08:00
Shiwen Cheng
ccd8aaebab
[Improvement][Server] Improve dependent task unit tests (#4911) 2021-03-03 08:52:45 +08:00
wenjun
f6088f277e
Optimize code comments (#4933)
Co-authored-by: mengyun <mengyun@pinduoduo.com>
2021-03-02 22:02:44 +08:00
chengshiwen
61f4086e84 [Fix-4897][Docker] Support supervisor management and fix log stdout 2021-03-02 21:27:14 +08:00
JuFeng Li
397c78149c
[Fix-4929][dao]fix ClassCastException when run hive sql with udf (#4930)
* ambari2.7.5+hdp3.1兼容ds1.3插件

* params.py

* delete unuseless code

* fix class cast exception

Co-authored-by: 李巨丰 <lijf@2345.com>
2021-03-02 18:26:14 +08:00
zhuangchong
ba2bb22100
[Improvement][API] create project success return project id (#4927)
* create project success return project id.

* update return data structure
2021-03-02 18:03:59 +08:00
Simon
c342980032
[Feature][jsonsplit] repalce project_id with code (#4904)
* 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
2021-03-02 16:43:19 +08:00
JuFeng Li
d01b2c432e
[Fix-4921][UI] Fix download log get return 404 (#4922)
* fix download log 404

* remove hard code and fix same download problem in downloadFile

Co-authored-by: 李巨丰 <lijf@2345.com>
2021-03-02 15:19:32 +08:00
lgcareer
43ba29a2dd
[Improvement-4624] When the server exist in the dead server list of zk,need stop service byself (#4626)
* [Improvement-4624] When the server exist in the dead server list of zk,need stop service byself

* [Improvement-4624]fix check style and add MaterRegistryTest

* [Improvement-4624]fix check style and add ZookeeperRegistryCenterTest

* [Improvement-4624]fix check style and add ZookeeperRegistryCenterTest

* [Improvement-4624]add RegisterOperatorTest

* [Improvement-4624]update RegisterOperatorTest

* [Improvement-4624]resolve code smell

* [Improvement-4624]revert LICENSE-@form-create-element-ui
2021-03-02 14:05:00 +08:00
Shiwen Cheng
54fc458e44
[Fix-4908][UI] Fix dependent task item cannot delete and select (#4909) 2021-03-01 21:58:39 +08:00
lenboo
2603d52044 Merge remote-tracking branch 'upstream/dev' into spilit 2021-03-01 15:20:34 +08:00
lenboo
df0e3e96b8 Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into spilit 2021-03-01 15:20:18 +08:00
Shiwen Cheng
a25c3974fc
[Improvement][README] Update official website link in readme (#4903) 2021-03-01 15:13:25 +08:00
Simon
6d087ccce0
[Feature][JsonSplit] fix processDefinitionService ut and bug (#4894)
* 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
2021-03-01 15:01:17 +08:00
chengshiwen
79b5f8c791 [Improvement][K8s] Optimize ingress compatibility 2021-02-28 12:08:44 +08:00
chengshiwen
01ee2b3211 [Improvement][K8s] Adapt to the latest alert-server with updated config and port 50052 2021-02-28 11:52:06 +08:00
dailidong
bfc5d1e4ba
Merge pull request #4875 from chengshiwen/improve-docker-faq
[Improvement][Docker/K8s] Add FAQ in docker/k8s and update outdated readme
2021-02-27 22:44:55 +08:00
zhuangchong
139211f3dd
Reduce queries after successful project creation. (#4901) 2021-02-27 21:39:21 +08:00
zhuangchong
a388b6853d
Optimize HashMap Initial Capacity. (#4896) 2021-02-27 21:36:03 +08:00
chengshiwen
5adf1db027 [Improvement][Docker] Update readme 2021-02-27 17:07:03 +08:00
John Bampton
d170b92dc6
Update the url for QuickStart in Docker (#4895) 2021-02-27 14:46:18 +08:00
chengshiwen
da6e1500cb [Improvement][Docker] Add DOLPHINSCHEDULER_OPTS for docker compose/swarm 2021-02-27 14:38:59 +08:00
chengshiwen
4cab4095e9 [Improvement][Docker] Update environment variables 2021-02-27 14:37:51 +08:00