Commit Graph

2543 Commits

Author SHA1 Message Date
lgcareer
dbc9f149b5 [Fix-#3487][sql] update uc_dolphin_T_t_ds_resources_un 2020-10-15 17:52:45 +08:00
lgcareer
68c59faf84 Merge remote-tracking branch 'remotes/upstream/1.3.3-release' into 1.3.3-release-fix#3789 2020-10-15 17:15:30 +08:00
lgcareer
3361151155
[fix-#3843][api]When update workflow definition,if name already exists, the prompt is not friendly (#3918)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat

* [FIX_#3789][remote]cherry pick from dev to support netty heart beat

* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly

* [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly

Co-authored-by: Kirs <acm_master@163.com>
2020-10-15 17:09:43 +08:00
lgcareer
ac9f5dc271 [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly 2020-10-15 16:48:48 +08:00
lgcareer
adda0eb4d0 [fix-3843][api] When update workflow definition,if name already exists, the prompt is not friendly 2020-10-15 15:51:16 +08:00
lgcareer
a7031353df Merge remote-tracking branch 'remotes/upstream/1.3.3-release' into 1.3.3-release-fix#3789 2020-10-15 14:46:41 +08:00
xingchun-chen
76609ba143
Merge pull request #3915 from break60/1.3.3-release
[fixbug-3621][ui]Repair check box cannot be canceled
2020-10-15 11:03:36 +08:00
break60
dc8e8926c8 Repair check box cannot be canceled 2020-10-15 10:35:47 +08:00
lgcareer
51d476be69
[FIX_#3789][remote]cherry pick from dev to support netty heart beat (#3913)
* [FIX_#3789][remote]cherry pick from dev to support netty heart beat

* [FIX_#3789][remote]cherry pick from dev to support netty heart beat

Co-authored-by: Kirs <acm_master@163.com>
2020-10-15 10:28:05 +08:00
lgcareer
b368c53784 [FIX_#3789][remote]cherry pick from dev to support netty heart beat 2020-10-14 18:52:37 +08:00
Kirs
f0ff8e2eb0 [FIX_#3789][remote]cherry pick from dev to support netty heart beat 2020-10-14 18:26:17 +08:00
BoYiZhang
e740dc7645
[FIX-3836][1.3.3-release-API] process definition validation name interface prompt information error (#3899)
* fix bug : error message

* fix code smell

* fix code smell
2020-10-14 16:54:31 +08:00
lgcareer
301d728c7b
[Fix-#3487][sql] add dolphinscheduler_dml.sql under 1.3.3_schema (#3907) 2020-10-14 16:28:53 +08:00
bao liang
f29f4e8384
[FIX-3617][Service]after subtask fault tolerance, 2 task instances are generated (#3830)
* fix bug(#3617): after subtask fault tolerance, 2 task instances are generated.

* delete unused code

* update code smell

* refactor sub work command process

* add process service ut

* add license header

* fix some code smell

* chang ut java8 to java11

* update sonar to java11

* copy ut config from dev

* remove checkstyle

* revert to 1.3.3

* change proess service test to executor service

* add process service test

* add process service test

* revert

* revert

* add comments

* change dev to 1.3.3-release

* revert

Co-authored-by: baoliang <baoliang@analysys.com.cn>
2020-10-13 18:05:27 +08:00
xingchun-chen
1894651f5f
Merge pull request #3890 from apache/revert-3870-1.3.3-bug-ui-fix-3835
Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters."
2020-10-12 17:28:32 +08:00
xingchun-chen
7eb103d903
Merge pull request #3888 from break60/1.3.3-release
[fixbug-3887][ui]Fix missing English translation of re-upload files
2020-10-12 16:56:20 +08:00
break60
8703b46fa0 revert pr 3872 2020-10-12 16:08:19 +08:00
bao liang
ac8d5644d5
Revert "[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters." 2020-10-12 15:58:05 +08:00
zhuangchong
fd0f5724a1
add process define name verify. (#3879) 2020-10-12 15:28:27 +08:00
break60
5764192d13 [fixbug-3887][ui]Fix missing English translation of re-upload files 2020-10-12 15:23:58 +08:00
xingchun-chen
e8db263d68
Merge pull request #3870 from zhuangchong/1.3.3-bug-ui-fix-3835
[1.3.3-release][fix-3835][ui] When the tenantName contains "<", the tenant drop-down list is blankadd verify tenant name cannot contain special characters.
2020-10-10 09:14:33 +08:00
zhuangchong
ef9221b02c resolve the conflict. 2020-10-09 18:55:14 +08:00
xingchun-chen
73bab1150e
Merge pull request #3877 from break60/1.3.3-release
[fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking
2020-10-09 17:56:58 +08:00
break60
ec2725d77d [fixbug-3621][ui]Workflow instance ready to stop and ready to suspend state prohibits checking 2020-10-09 17:23:04 +08:00
xingchun-chen
1bf2f0d8e0
Merge pull request #3872 from break60/1.3.3-release
[fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers
2020-10-09 17:17:36 +08:00
lgcareer
66e9a1436e
[Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it need replace the origin resource file. (#3862)
* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.

* [Fix-#3702][api] When re-upload the resource file but don't change the name or desc,it will not replace the origin resource file.
2020-10-09 17:13:26 +08:00
break60
6829119958 fix 2020-10-09 17:00:44 +08:00
break60
0ee1552d46 fix 2020-10-09 16:56:18 +08:00
break60
a7e7d09540 fix 2020-10-09 16:01:12 +08:00
break60
cad4420242 [fixBug-3840][ui]The tenant code only allows letters or a combination of letters and numbers 2020-10-09 15:42:47 +08:00
zhuangchong
ec81f46853 add verify tenant name cannot contain special characters. 2020-10-09 10:25:55 +08:00
xingchun-chen
d946717fcb
Merge pull request #3848 from break60/1.3.3-release
[fixBug-3621][ui]Select the batch checkbox to unfilter the instances …
2020-09-29 15:55:42 +08:00
break60
b6761b0299 [fixBug-3621][ui]Select the batch checkbox to unfilter the instances in the executing state 2020-09-29 15:03:44 +08:00
Jave-Chen
a51dafc382 Set up JDK 11 for SonarCloud in github action. (#3052)
* Set up JDK 11 for SonarCloud in github action.

* Fix javadoc error with JDK 11.

* Prevent Javadoc from stopping if it finds any html errors.
2020-09-28 14:09:01 +08:00
Yichao Yang
90c90b25b0 [Hotfix-3131][api] Fix the new tenant already exists prompt (#3132)
* Bugfix: Fix the new tenant already exists prompt

* Feature: Add test cases

* Update TenantServiceTest.java

Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>
2020-09-28 11:42:21 +08:00
xingchun-chen
ea56513172
Merge pull request #3812 from lgcareer/1.3.3-release-cherrypick
[Fix-#3487][api、dao] Cherry pick from dev to fix that create folder duplicate name under multithreading
2020-09-25 16:02:37 +08:00
lgcareer
f0abf92158 Merge remote-tracking branch 'remotes/upstream/1.3.3-release' into 1.3.3-release-cherrypick 2020-09-24 16:33:10 +08:00
muzhongjiang
d6f62f1de4 [Fix-#3487][api、dao] cherry pick from dev to fix that create folder duplicate name under multithreading 2020-09-24 16:16:49 +08:00
lgcareer
2e4f9f19ce
[Fix-#3713][common]Fix that catfile method Stream not closed (#3810)
* [Bug-3713][HadoopUtils] catfile method Stream not closed  (#3715)

* fix bug

Delete invalid field: executorcores

Modify verification prompt

* fix bug

Delete invalid field: executorcores

Modify verification prompt

* fix bug

Delete invalid field: executorcores

Modify verification prompt

* dag  add close button

* reset last version

* reset last version

* dag add close buttion

dag add close buttion

* update  CLICK_SAVE_WORKFLOW_BUTTON  xpath

* updae CLICK_SAVE_WORKFLOW_BUTTON xpath

* updae CLICK_SAVE_WORKFLOW_BUTTON xpath

* updae CLICK_SAVE_WORKFLOW_BUTTON xpath

* Update CreateWorkflowLocator.java

modify submit workflow button

* Update CreateWorkflowLocator.java

* Update CreateWorkflowLocator.java

modify CLICK_ADD_BUTTON

* Update CreateWorkflowLocator.java

delete print

* Update CreateWorkflowLocator.java

1

* Update CreateWorkflowLocator.java

1

* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks

in addition

update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'

* Update dag.vue

* Update dag.vue

* Update dag.vue

* Update CreateWorkflowLocator.java

* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"

This reverts commit 3a2cba7a

* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks

in addition

update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'

* Update dolphinscheduler-daemon.sh

* catfile method Stream not closed

* catfile method Stream not closed

Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>

* [Fix-#3713][common]Fix that catfile method Stream not closed

Co-authored-by: BoYiZhang <39816903+BoYiZhang@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
2020-09-24 15:28:02 +08:00
lgcareer
268d09de1a [Fix-#3713][common]Fix that catfile method Stream not closed 2020-09-24 14:42:33 +08:00
BoYiZhang
75bc3a626e [Bug-3713][HadoopUtils] catfile method Stream not closed (#3715)
* fix bug

Delete invalid field: executorcores

Modify verification prompt

* fix bug

Delete invalid field: executorcores

Modify verification prompt

* fix bug

Delete invalid field: executorcores

Modify verification prompt

* dag  add close button

* reset last version

* reset last version

* dag add close buttion

dag add close buttion

* update  CLICK_SAVE_WORKFLOW_BUTTON  xpath

* updae CLICK_SAVE_WORKFLOW_BUTTON xpath

* updae CLICK_SAVE_WORKFLOW_BUTTON xpath

* updae CLICK_SAVE_WORKFLOW_BUTTON xpath

* Update CreateWorkflowLocator.java

modify submit workflow button

* Update CreateWorkflowLocator.java

* Update CreateWorkflowLocator.java

modify CLICK_ADD_BUTTON

* Update CreateWorkflowLocator.java

delete print

* Update CreateWorkflowLocator.java

1

* Update CreateWorkflowLocator.java

1

* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks

in addition

update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'

* Update dag.vue

* Update dag.vue

* Update dag.vue

* Update CreateWorkflowLocator.java

* Revert "Setting '-XX:+DisableExplicitGC ' causes netty memory leaks"

This reverts commit 3a2cba7a

* Setting '-XX:+DisableExplicitGC ' causes netty memory leaks

in addition

update '- XX: largepagesizeinbytes = 128M' to '- XX: largepagesizeinbytes = 10M'

* Update dolphinscheduler-daemon.sh

* catfile method Stream not closed

* catfile method Stream not closed

Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
2020-09-24 14:42:06 +08:00
xingchun-chen
2838254cb2
Merge pull request #3803 from break60/1.3.3-release
[fixBug-3792][ui]Click on the sidebar to adapt the width of the pie c…
2020-09-24 11:07:07 +08:00
break60
387437a669 [fixBug-3792][ui]Click on the sidebar to adapt the width of the pie chart on the project homepage 2020-09-24 10:04:28 +08:00
qiaozhanwei
dce518c346
[Fix-3258][Security][Worker group manage] Connot get create time and update time,report DateTimeParseException (#3787)
* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.

* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect

* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect

* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect

* [BugFixed] issue #3258 (#3265)

* 'ExecutionStatus'

* '3258'

* Update WorkerGroupServiceTest.java

* Delete UserState.java

* Delete ResourceSyncService.java

* Delete core-site.xml

* Delete hdfs-site.xml

Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: qiaozhanwei <qiaozhanwei@outlook.com>

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-09-22 17:38:45 +08:00
qiaozhanwei
4087485416
[Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3786)
* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.

* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect

* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect

* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
2020-09-22 14:11:34 +08:00
lgcareer
09bdd99004
[Fix-3124][docker]Fix that can not build a docker image on windows (#3765) 2020-09-22 10:04:26 +08:00
qiaozhanwei
5c8171e397
[Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect (#3784)
* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* [Fix-3616][Server] when worker akc/response master exception , async retry

* The batch delete function in the workflow definition and workflow instance pages cannot be canceled if selected.

* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect

* [Fix-3549] [Server][sqlTask]The alias column in the query SQL does not take effect

Co-authored-by: qiaozhanwei <qiaozhanwei@analysys.com.cn>
Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: JinyLeeChina <42576980+JinyLeeChina@users.noreply.github.com>
2020-09-21 18:05:50 +08:00
xingchun-chen
801d7bd834
Merge pull request #3782 from break60/1.3.3-release
[Improvement-3720][ui] js mailbox verification fix
2020-09-21 17:35:38 +08:00
break60
fd7493924c [Improvement-3720][ui] js mailbox verification fix 2020-09-21 17:15:57 +08:00
xingchun-chen
44645657b2
Merge pull request #3781 from break60/1.3.3-release
[Fix-3707][ui]cherry pick The batch delete function in the workflow definition and workflow ins…
2020-09-21 17:09:26 +08:00