Commit Graph

4225 Commits

Author SHA1 Message Date
zhuangchong
5b4a8fdcf5
[fix-3788][pom]spring framework Security breach (#3882)
* spring framework Security breach,update springboot version.

* update license.

* update license.

* update netty license.

* update license.

* Update known-dependencies.txt

* Update known-dependencies.txt

Co-authored-by: zhuangchong <zhuangchong8@163.com>
Co-authored-by: dailidong <dailidong66@gmail.com>
2020-10-15 19:52:23 +08:00
zhuangchong
2fbbf96cde
[Improvement-3686][service] ProcessService method name meets naming convention. (#3687)
* ProcessService method name meets naming convention.

* add code checkstyle.

* update test.

* update test.

* add code checkstyle.

* add code checkstyle.

* update pom.

* update pom.

* ProcessService method name meets naming convention.

* update processService code.

* update code style.

* update code style.

* update code style.

Co-authored-by: zhuangchong <zhuangchong8@163.com>
2020-10-15 19:44:22 +08:00
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
BoYiZhang
13030502fd
[FIX-3836][dev-API] process definition validation name interface prompt information error (#3908)
* 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

* process definition validation name interface prompt information error

Co-authored-by: dailidong <dailidong66@gmail.com>
Co-authored-by: xingchun-chen <55787491+xingchun-chen@users.noreply.github.com>
2020-10-15 14:09:28 +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
BoYiZhang
622bce603a
Merge pull request #19 from apache/dev
update code from apa
2020-10-14 15:52:27 +08:00
Zhou.Z
4f0c74dcc1 Update Status.java 2020-10-14 12:43:07 +08:00
zhuangchong
d32300ba5b
add process define name verify. (#3864) 2020-10-14 10:51:47 +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
Zhou.Z
37762c29ea
Merge branch 'dev' into dev-FTS 2020-10-13 13:49:34 +08:00
Kirs
08dc6913dc
[FIX_BUG_1.3#3789][remote]support netty heart beat (#3868)
* [FIX_BUG_1.3#3789][remote]support netty heart beat

* netty heart beat

* code style

* code style

* code style

* code style

* code style

* delete code docs

* client fail-close
2020-10-12 23:29:38 +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
a4c232c316
Merge pull request #3861 from yinancx/fs-dev
[Feature][ui]Force success operation
2020-10-12 14:20:20 +08:00
bao liang
9de7d3c772
[FIX-3573][DAO] potential horizontal unauthorized access (#3880)
* fix bug[#3573] potential horizontal unauthorized access

* fix bug[#3573] potential horizontal unauthorized access

Co-authored-by: baoliang <baoliang@analysys.com.cn>
2020-10-12 10:23:44 +08:00
bao liang
39411ce03b
[FIX-3617][Service]fix 2 tasks instance are generated when fault tolerance (#3873)
* fix 2 tasks instance are generated when fault tolerance

* update code style

* update code style

* update code style

* update code style

* update code style

* update code style

* update code style

* update code style

* update code style

* update code style

* update code style

* update ut

* update code style

Co-authored-by: baoliang <baoliang@analysys.com.cn>
2020-10-10 15:05:56 +08:00
hailin0
c4be3b5749
[Fix][API] Log dependency package conflict (#3833)
Co-authored-by: lisiying <lisiying@192.168.0.102>
2020-10-10 11:14:32 +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
AhahaGe
1a257b1077
[Feature][api]Export and import workflow add processDefinitionDescription #3808 (#3847)
* add .asf.yaml file

* export processDefinition add desc

* clear conentent in .asf.yaml

* delete .asf.yaml file

Co-authored-by: guirong.ggr <guirong.ggr@dtwave-inc.com>
2020-10-09 21:00:02 +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
dailidong
8e0fb35366
Update dolphinscheduler-common/src/test/java/org/apache/dolphinscheduler/common/threadutils/ThreadUtilsTest.java
Co-authored-by: Yichao Yang <1048262223@qq.com>
2020-10-08 23:27:36 +08:00
yangruochen
7c1ff53a74
[Bug-3845]postgresql need to add IF NOT EXISTS for table t_ds_process… (#3852)
* [Bug-3845]postgresql need to add IF NOT EXISTS for table t_ds_process_definition_version too.

* restart unit test

* rerun unit test
2020-10-08 17:23:40 +08:00
Yarlung
1c96ae0944
[Fix-3840][server] Fix When the tenant code is a number, it should not be saved successfully (#3867)
* bug fixed #3840

* fix bug #3840

* bug fixed #3840

* bug fixed issue #3840

* bug fix #3840

* bug fix #3540

Co-authored-by: gechunfa <gechunfa@gechunfas-MacBook-Pro.local>
2020-10-08 17:08:26 +08:00
xingchun-chen
76f6e20439
Merge pull request #3849 from yinancx/dev
[Feature][ui]Waiting dependent nodes start timeout
2020-09-30 09:21:55 +08:00
曹聚阳
df33d1a28e Force success 2020-09-29 23:06:53 +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