提交 · e4dad2ac3f33a415069a3fa19b1c8ad16dbc2bb8 · apache / DolphinScheduler

23 4月, 2020 6 次提交
- O
  
  fix showType in sql.vue · e4dad2ac
  由 oceanos 提交于 4月 23, 2020
  
  e4dad2ac
- O
  
  Merge remote-tracking branch 'origin/dev' into dev · 85619909
  由 oceanos 提交于 4月 23, 2020
  
  85619909
- O
  
  fix ui i18n issue · d4d31088
  由 oceanos 提交于 4月 23, 2020
  
  d4d31088
- O
  Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev · dc2836d1
  由 oceanos 提交于 4月 23, 2020
```
 Conflicts:
	install.sh
```
  dc2836d1
- L
  [fix #2442] It will give a error tip that resource not exist exwhen update resources. (#2483) · 44770a87
  由 lgcareer 提交于 4月 23, 2020
```
* fix #2442 and remove unavailable code

* revert verifyResourceName method

* Add ServiceException

* add ServiceExceptionTest

* update ServiceExceptionTest

* add ServiceExceptionTest in pom
```
  44770a87
- S
  fix #2450 (#2493) · b5fdce41
  由 Simon 提交于 4月 23, 2020
```
* fix #1441

* support custom datax config

* support datax custom config

* support datax custom config

* support datax custom config

* fix #2450
Co-authored-by: N张世鸣 <zhangshiming@cvte.com>
Co-authored-by: Ndailidong <dailidong66@gmail.com>
```
  b5fdce41
22 4月, 2020 6 次提交
- K
  reset default zookeeper parameter #2494 (#2495) · 2f5427ca
  由 Kevin 提交于 4月 22, 2020
```
* reset default zookeeper parameter

* fix install.sh zookeeper.properties
Co-authored-by: Ndailidong <dailidong66@gmail.com>
```
  2f5427ca
- D
  
  Merge branch 'dev' into dev · c9008bc4
  由 dailidong 提交于 4月 22, 2020
  
  c9008bc4
- sovle error that zookeeper.quorum configuration in install.sh (#2489) · 0aff45ca
  由 _和提交于 4月 22, 2020
```
Co-authored-by: Nsunchaohe <sunzhaohe@linklogis.com>
Co-authored-by: Ndailidong <dailidong66@gmail.com>
```
  0aff45ca
- Z
  resolve #2475 Ambari plugin development for the dolphin scheduler in version 2.0.0 … (#2488) · 276e3f9a
  由 zhangchunyang 提交于 4月 22, 2020
```
* Ambari plugin development for the dolphin scheduler in version 2.0.0 is complete

* Update the Ambari plugin of DS  usage documentation

* delete readme whic is not completed
Co-authored-by: Nzhangchunyang <zhangchunyang@analysys.com.cn>
```
  276e3f9a
- O
  
  fix install.sh zookeeper.properties · 0bbdbf69
  由 oceanos 提交于 4月 22, 2020
  
  0bbdbf69
- O
  
  reset default zookeeper parameter · 80279662
  由 oceanos 提交于 4月 22, 2020
  
  80279662
21 4月, 2020 6 次提交

O

Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev · 85385e10
由 oceanos 提交于 4月 21, 2020

85385e10

由 qiaozhanwei 提交于 4月 21, 2020

* dispatch task fail will set task status failed

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，task status statistics and process status statistics bug fix (#2357)
2，worker group bug fix

* 1，task status statistics and process status statistics bug fix (#2357)
2，worker group bug fix

* 1，task status statistics and process status statistics bug fix (#2357)
2，worker group bug fix

* 1，task status statistics and process status statistics bug fix (#2357)
2，worker group bug fix

* send mail error, #2466 bug fix

* send mail error, #2466 bug fix

* send mail error, #2466 bug fix

* send mail error, #2466 bug fix

* #2486 bug fix
Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>

54fc32e2

send mail error, #2466 bug fix (#2470) · 28766df5

由 qiaozhanwei 提交于 4月 21, 2020

* dispatch task fail will set task status failed

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，task status statistics and process status statistics bug fix (#2357)
2，worker group bug fix

* 1，task status statistics and process status statistics bug fix (#2357)
2，worker group bug fix

* 1，task status statistics and process status statistics bug fix (#2357)
2，worker group bug fix

* 1，task status statistics and process status statistics bug fix (#2357)
2，worker group bug fix

* send mail error, #2466 bug fix

* send mail error, #2466 bug fix

* send mail error, #2466 bug fix

* send mail error, #2466 bug fix
Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>

28766df5

resolve #2474 (#2477) · f3dc1c94

由 zhangchunyang 提交于 4月 21, 2020

* In the dev branch, in order to the RPM package which is printed under the dist module contain configuration files: master.properties, worker.properties

* Restore files deleted by mistake
Co-authored-by: Nzhangchunyang <zhangchunyang@analysys.com.cn>
Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>

f3dc1c94

Modify worker parameters (#2479) · 3740b241

由 break60 提交于 4月 21, 2020

* Fix the problem of data echo in script edit box

* Optimize resource tree

* Change the name of the shell node and modify the parameter transmission method of spark, mr, python, and flink nodes

* Repair naming

* Modify list style

* Online editing is prohibited

* Change the background color of the disabled state of the radio button when the workflow goes online

* Modify worker parameters
Co-authored-by: Ndailidong <dailidong66@gmail.com>
Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>

3740b241

simplify and optimize config (#2469) · eec92ed1

由 dailidong 提交于 4月 21, 2020

* [Refactor worker] simplify and optimize config (#2386)

* simplify config

* simplify config

* simplify and optimize config

* Update HadoopUtils.java

optimize HadoopUtils

* Update HadoopUtilsTest.java

* Update HadoopUtilsTest.java

* Update HadoopUtilsTest.java

* Update HttpUtils.java

* Update pom.xml

* Update HadoopUtilsTest.java

* Update HadoopUtilsTest.java

* Update HadoopUtilsTest.java

* Update HadoopUtilsTest.java

* Update HadoopUtilsTest.java

* Update HadoopUtilsTest.java

eec92ed1

20 4月, 2020 4 次提交

D

Update pom.xml (#2467) · dc36c77b
由 dailidong 提交于 4月 20, 2020

dc36c77b
D
exclude HadoopUtils Test (#2465) · 0f54149a
由 dailidong 提交于 4月 20, 2020
```
* Update pom.xml

* Update pom.xml
```
0f54149a

Change the background color of the disabled state of the radio button when the... · ef686811

由 break60 提交于 4月 20, 2020

Change the background color of the disabled state of the radio button when the workflow goes online #2451 (#2453)

* Fix the problem of data echo in script edit box

* Optimize resource tree

* Change the name of the shell node and modify the parameter transmission method of spark, mr, python, and flink nodes

* Repair naming

* Modify list style

* Online editing is prohibited

* Change the background color of the disabled state of the radio button when the workflow goes online
Co-authored-by: Ndailidong <dailidong66@gmail.com>
Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>

ef686811

move dependent and conditions to master server (#2423) · 4946e888

由 bao liang 提交于 4月 20, 2020

* move condition and dependent to master

* move conditions to master

* move conditions and dependent task to master

* move conditions to master

* update test

* add log

* add test for dependent task

* add test for dependent task

* update

* update

* refactor complexity code

* refactor complexity code

* add conditions task test

* add conditions task test

* update

* update host to host:port

* update logback.xml
Co-authored-by: Nbaoliang <baoliang@analysys.com.cn>

4946e888

18 4月, 2020 1 次提交

solve code spell problem (#2419) · ca66cfec

由 _和提交于 4月 18, 2020

* solve code spell problem

* remove controller test

* add controller test

* sovle spell problem and sovle conflict

* sovle spell problem and sovle conflict

* sovle spell problem and add test
Co-authored-by: Nsunchaohe <sunzhaohe@linklogis.com>

ca66cfec

17 4月, 2020 6 次提交
- X
  Merge pull request #2440 from Rubik-W/fixbug-#2439 · c4f44a62
  由 xingchun-chen 提交于 4月 17, 2020
```
fix: Gantt chart bug #2439
```
  c4f44a62
- R
  
  Merge branch 'dev' into fixbug-#2439 · e2775c0d
  由 Rubik-W 提交于 4月 17, 2020
  
  e2775c0d
- H
  update controllers with ApiException annotation (#2401) · 4769bce0
  由 Han Gao 提交于 4月 17, 2020
```
Co-authored-by: Ndailidong <dailidong66@gmail.com>
Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>
```
  4769bce0
- Q
  
  Merge branch 'dev' into fixbug-#2439 · 5ccd742a
  由 qiaozhanwei 提交于 4月 17, 2020
  
  5ccd742a
- B
  Online editing is prohibited (#2444) · f5a8b566
  由 break60 提交于 4月 17, 2020
```
* Fix the problem of data echo in script edit box

* Optimize resource tree

* Change the name of the shell node and modify the parameter transmission method of spark, mr, python, and flink nodes

* Repair naming

* Modify list style

* Online editing is prohibited
Co-authored-by: Ndailidong <dailidong66@gmail.com>
Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>
```
  f5a8b566
- O
  
  Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev · f01940a1
  由 oceanos 提交于 4月 17, 2020
  
  f01940a1
16 4月, 2020 5 次提交

D

Merge branch 'dev' into fixbug-#2439 · 8b00582e
由 dailidong 提交于 4月 16, 2020

8b00582e

[optimization]：prevent repeated database updates (#2396) · f929c6f3

由 songgg 提交于 4月 16, 2020

* sqlTask failed to run

* prevent repeated database updates

* prevent repeated database updates

* prevent repeated database updates
Co-authored-by: Nsongqh <songquanhe@foxmail.com>
Co-authored-by: Ndailidong <dailidong66@gmail.com>

f929c6f3

1，task status statistics and process status statistics bug fix (#2357) ... · d6798c6d

由 qiaozhanwei 提交于 4月 16, 2020

1，task status statistics and process status statistics bug fix (#2357)  2，worker group bug fix (#2430)

* dispatch task fail will set task status failed

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result

* 1，task status statistics and process status statistics bug fix (#2357)
2，worker group bug fix

* 1，task status statistics and process status statistics bug fix (#2357)
2，worker group bug fix

* 1，task status statistics and process status statistics bug fix (#2357)
2，worker group bug fix

* 1，task status statistics and process status statistics bug fix (#2357)
2，worker group bug fix
Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>

d6798c6d

Q

Merge branch 'dev' into fixbug-#2439 · aec883ce
由 qiaozhanwei 提交于 4月 16, 2020

aec883ce
R

fix: Gantt chart bug · 7c70ef82
由 Rubik-W 提交于 4月 16, 2020

7c70ef82

15 4月, 2020 6 次提交

L
fix NPE when grant resource or save process definition (#2434) · 8b4eb20b
由 lgcareer 提交于 4月 15, 2020
```
Co-authored-by: Ndailidong <dailidong66@gmail.com>
```
8b4eb20b

Update worker_group_id to worker_group (#2433) · 347f05f0

由 xingchun-chen 提交于 4月 15, 2020

* add LoginTest license

* Delete useless packages

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* e2e add project and workflow case

* Update worker_group_id to worker_group in init.sql

* Update worker_group_id to worker_group in init.sql

* Update worker_group_id to worker_group
Co-authored-by: chenxingchun <438044805@qq.com>

347f05f0

Solve the failure to execute non-query sql (#2413) · f2183707

由 _和提交于 4月 15, 2020

Co-authored-by: Nsunchaohe <sunzhaohe@linklogis.com>
Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>
Co-authored-by: Nlgcareer <18610854716@163.com>

f2183707

Repair naming (#2426) · c4acbdcf

由 break60 提交于 4月 15, 2020

* Fix the problem of data echo in script edit box

* Optimize resource tree

* Change the name of the shell node and modify the parameter transmission method of spark, mr, python, and flink nodes

* Repair naming

* Modify list style
Co-authored-by: Ndailidong <dailidong66@gmail.com>
Co-authored-by: Nqiaozhanwei <qiaozhanwei@outlook.com>

c4acbdcf

1，no worker condition , master will while ture wait for worker startup... · 96835ebd

由 qiaozhanwei 提交于 4月 15, 2020

1，no worker condition , master will while ture wait for worker startup 2，worker response task status sync wait for result (#2420)

* dispatch task fail will set task status failed

* 1，no worker condition , master will while ture wait for worker startup
2，worker response task status sync wait for result
Co-authored-by: Nqiaozhanwei <qiaozhanwei@analysys.com.cn>

96835ebd

L
add worker_group field and remove worker_group_id field of the table... · 0bad7c2f
由 lgcareer 提交于 4月 15, 2020
```
add worker_group field and remove worker_group_id field of the table t_ds_command and t_ds_error_command (#2428)
```
0bad7c2f

apache / DolphinScheduler 上一次同步 1 年多

apache / DolphinScheduler
上一次同步 1 年多