Commit Graph

4667 Commits

Author SHA1 Message Date
wuxiaofei
450c84baf1 [CodeStyle][PeerQueueTest]TimeUnit seperated from previous import 2021-02-22 13:24:15 +08:00
wuxiaofei
179507ba54 Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev_wuxiaofei_server 2021-02-22 12:39:53 +08:00
wuxiaofei
28975d7397 [CodeStyle][QueueTest]empty line more than one line of impor style 2021-02-22 12:25:02 +08:00
wuxiaofei
d1189674af [CodeStyle][QueueTest]code style 2021-02-22 12:21:14 +08:00
wuxiaofei
1838c817a1 [CodeStyle][QueueTest]import style 2021-02-22 12:18:23 +08:00
wuxiaofei
9da30dd175 [Test][TaskPriorityQueueImplTest]Test with coverity 2021-02-22 12:14:25 +08:00
wuxiaofei
bc2a8fb149 [Test][PeerTaskInstancePriorityQueueTest]testPoll added 2021-02-22 10:52:38 +08:00
wuxiaofei
5faa5d1703 [BUG][PeerTaskInstancePriorityQueue]poll implemented in PriorityQueue 2021-02-22 10:20:22 +08:00
wuxiaofei
354b1cd928 [Checkstyle][common]delete unknown soft_version 2021-02-22 09:56:52 +08:00
wuxiaofei
f2e41c298f [Checkstyle][TaskPriorityQueueConsumer]import check 2021-02-22 01:16:07 +08:00
wuxiaofei
b352c52f33 [Improvement][master] Replace sleep&task with poll in TaskPriorityQueueConsumer#4137 2021-02-21 23:47:48 +08:00
Shiwen Cheng
f166de1798
[Improvement][K8s] Support resource storage when fs.defaultFS=file:/// (#4777) 2021-02-21 22:44:55 +08:00
Shiwen Cheng
4fd3cf9ea2
[Improvement][Docker] Update outdated readme (#4775) 2021-02-21 22:43:11 +08:00
wuxiaofei
11c22ccbca Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev_wuxiaofei_server 2021-02-21 22:36:48 +08:00
zhuangchong
4aac23481e
[Fix-4757][worker] fix worker failover host error (#4799)
* resolve code conflicts

* resolve code conflicts

* resolve code conflicts

* update WorkerGroupServiceImpl code style.

* update worker group service test host data.

* add ZookeeperNodeHandlerTest class

* change WorkerZkNode to Host class.

* add generate host string method.
2021-02-21 00:34:23 +08:00
wangxj3
874ca07e6e
[Feature-3805][mater-worker-ui]fix function of passing variables between tasks bug (#4811)
* global initParam and set Param

* fix dataFormat error

* fix deal outParams bug

* fix code style

* fix code style

* fix code style

* fix code style

* fix code style

* fix code style

* fix code style

* add test

* fix code style (variable name)

* fix reset globalParams bug

* fix format bug

* fix SonarCloud Code Analysis

* add test

* fix code style

* fix code style

* modify test

* fix test Coverage

* fix code style

* 4 test

* add test pom

* add header

Co-authored-by: wangxj <wangxj31>
2021-02-20 14:32:46 +08:00
Shiwen Cheng
8879d8ff60
[Improvement][*] Define version with revision globally and update version to 1.3.6-SNAPSHOT (#4773)
* [Improvement][*] Update version to 1.4.0-SNAPSHOT

* [Improvement][*] Update tab to space under checkstyle

* [Improvement][*] Define version with revision globally

* [Improvement][*] Update version to 1.3.6-SNAPSHOT
2021-02-20 14:22:49 +08:00
zhuangchong
a4de385a21
the alert instance page displays the name of the alert plug-in. (#4815) 2021-02-20 09:32:49 +08:00
Shiwen Cheng
fdf719c1e9
[Fix-4796][UI] Fix child file upload failure and file id mixed problem (#4797) 2021-02-20 08:43:12 +08:00
zhuangchong
4c8f06002f
fix api swagger params error. (#4818) 2021-02-20 08:16:24 +08:00
felix.wang
3110f023af
[BUG][API]Fix format2Duration when parameter has one is null (#4802)
* fix format2Duration when parameter has one is null
2021-02-19 23:18:11 +08:00
CalvinKirs
cf042ccd6c rename example.sh 2021-02-19 23:01:20 +08:00
CalvinKirs
5e1be068c4 [Improvement][spi-alert]script plugin should contain alert content
fix alert params contain space not parse

fix  stream not close
2021-02-19 22:49:21 +08:00
CalvinKirs
2852420144 Merge branch 'dev' into script_thread
# Conflicts:
#	dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/main/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptSender.java
#	dolphinscheduler-alert-plugin/dolphinscheduler-alert-script/src/test/java/org/apache/dolphinscheduler/plugin/alert/script/ScriptSenderTest.java
2021-02-19 22:48:02 +08:00
CalvinKirs
af00de357a [Improvement][spi-alert]script plugin should contain alert content
fix alert params contain space not parse

fix  stream not close
2021-02-19 22:36:43 +08:00
CalvinKirs
35fc7dd851 Merge branch 'dev' into script_thread 2021-02-19 22:35:13 +08:00
CalvinKirs
4275bde927 [Improvement][spi-alert]script plugin should contain alert content
fix alert params contain space not parse

fix  stream not close
2021-02-19 22:31:41 +08:00
dddyszy
ce007813fb
[Improvement][Api] add @Override on the Override method (#4808)
Co-authored-by: 施洲轶 <shizhy@yoozoo.com>
2021-02-19 18:15:43 +08:00
lenboo
59811d0efb Merge remote-tracking branch 'upstream/dev' into params-trans 2021-02-19 16:02:55 +08:00
Shiwen Cheng
61397b338a
[Improvement][api] Introduce base service interface for clear code and unify all controllers, services and tests of api (#4798)
* [Improvement][api] Introduce base service interface for clear code

* [Improvement][api] Unify all controllers, services and tests of api

* [Fix][api] Fix unit tests left over from the past

* [Improvement][api] Use RegexUtils.escapeNRT instead of StringUtils.replaceNRTtoUnderline for vulnerable check
2021-02-19 11:52:42 +08:00
zhuangchong
68de43ad27
[Fix-4776][Alert] Alert instance edit page partial parameter values are not displayed (#4782)
* generate warning instance plugin params.

* update PluginParamsTransfer.generatePluginParams method.

* update code style in the AlertPluginInstanceServiceImpl class.

* JSONUtils rollback.

* rerun e2e test.

* update alert channel generate params.

* update email alert channel test class.

* update json utils parse object method.

* update the data structure of the alarm script plug-in script type parameter to String.
2021-02-19 09:50:47 +08:00
Shiwen Cheng
15a5b05883
[Improvement-3369][api] Introduce executor and datasource service interface for clear code (#4759) 2021-02-18 23:27:37 +08:00
Shiwen Cheng
9ae29a756f
[Improvement-3369][api] Introduce resources, scheduler and taskinstance service interface for clear code (#4766)
* [Improvement-3369][api] Introduce resources, scheduler and taskinstance service interface for clear code
2021-02-18 23:17:01 +08:00
wuxiaofei
8ec345c35b [Improvement][TaskExecuteProcessor]Delete redundant code in method of setTaskCache 2021-02-18 20:48:09 +08:00
Shiwen Cheng
dc55b5ba6f
[Improvement-3369][api] Introduce monitor, processinstance and queue service interface for clear code (#4765)
* [Improvement-3369][api] Introduce monitor, processinstance and queue service interface for clear code
2021-02-18 19:27:13 +08:00
Shiwen Cheng
070424fc78
[Improvement-3369][api] Introduce taskrecord, udffunc, workflowlineage and workergroup service interface for clear code (#4768)
* [Improvement-3369][api] Introduce taskrecord, udffunc, workflowlineage and workergroup service interface for clear code
2021-02-18 19:18:05 +08:00
yimaixinchen
938621ab34
initStateLister rename to initStateListener (#4795)
Co-authored-by: v_taoouyang <v_taoouyang@tencent.com>
2021-02-18 18:48:09 +08:00
Shiwen Cheng
a53195fa15
[Improvement-3369][api] Introduce alert group and users service interface for clear code (#4758) 2021-02-18 15:05:49 +08:00
zhuangchong
36d7a4fea0
Implement workflow definition page button unelectable state to add button prompt (#4762) 2021-02-18 11:52:41 +08:00
Shiwen Cheng
d4fd9811f8
[Fix-4734][UI] Fix file update dialog not reset after re-open the dialog (#4735) 2021-02-18 11:51:55 +08:00
zhuangchong
5e193cf414
[Fix-4674][UI] create warning instance and click Submit , without validate the required parameters (#4767)
* fix wareningInstance create instance validate parameter.

* rerun e2e test.
2021-02-18 11:46:50 +08:00
Shiwen Cheng
8ebddc1f5b
[Fix-3298][K8s] Fix wrong host of task instance in k8s (#4786) 2021-02-18 11:41:58 +08:00
小清
dc7a0a0f0e
Update AbstractCommandExecutor.java 2021-02-18 10:54:01 +08:00
lenboo
90e197a4c5 add return result 2021-02-18 10:25:51 +08:00
lenboo
7e9d582025 Merge remote-tracking branch 'upstream/dev' into params-trans 2021-02-18 10:23:52 +08:00
wuxiaofei
91e563daeb Merge branch 'dev' of https://github.com/apache/incubator-dolphinscheduler into dev 2021-02-18 10:22:11 +08:00
zhuangchong
23591b71a2
[Improvement-4751][API] Improvement the duration field modify the display to a time-based minute-second format (e.g. 1d 10h 20m 1s) (#4752)
* imp ui instance duration field display content.

* update DateUtils format2Duration method.
2021-02-18 10:08:23 +08:00
Shiwen Cheng
d41dd10a16
[Fix][CI] Fix error: unable to resolve action apache/skywalking-eyes@9bd5feb (#4784) 2021-02-17 11:48:47 +08:00
zhuangchong
18e4087c7e
[Improvement][JSONUtils] Improvement JSONUtils parse object method (#4781)
* Improvement JSONUtils parse object method.

* update JSONUtils toMap method.

* rerun ut test.
2021-02-16 20:22:01 +08:00
zhuangchong
5025b5015f
Repair dolphinscheduler-mysql.sql error sql. (#4780) 2021-02-16 10:19:27 +08:00