Commit Graph

4546 Commits

Author SHA1 Message Date
lenboo
f1375b996e Merge remote-tracking branch 'upstream/dev' into spilit 2021-02-23 10:22:17 +08:00
guohaozhang
ffcb1c22e1
[Improvement-#3735] Make task delayed execution more efficient (#4812)
* [Improvement-3735] improve implementation of delay task execution

* [Improvement][worker] delay task compatible with dev branch and fix test


Co-authored-by: vanilla111 <1115690319@qq.com>
2021-02-23 10:10:11 +08:00
gaojun2048
0d1bbd8e4b
Merge pull request #4814 from CalvinKirs/script_thread
[Improvement][spi-alert]script plugin should contain alert content
2021-02-22 14:00:50 +08:00
lenboo
674af059b8 Merge remote-tracking branch 'upstream/dev' into spilit 2021-02-22 10:16:33 +08:00
bao liang
62e961e3f1
[Feature][JsonSplit]refactor remove the json in process instance and definition (#4828)
* #4417 [JsonSplit] refactor process definition json

* [#4177] refactor json split. remove json in process definition and process instance

* [#4177] refactor json split. copy process definition need set task code 0L.

* code style

* code style

* code style

* code style

* update

* update
2021-02-22 10:13:32 +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
lenboo
2d1d91d1f8 Merge remote-tracking branch 'upstream/dev' into spilit 2021-02-21 14:54:53 +08:00
lenboo
4c9c41933d Merge remote-tracking branch 'upstream/dev' into spilit
# Conflicts:
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/ProcessInstanceService.java
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionServiceImpl.java
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionVersionServiceImpl.java
2021-02-21 14:54:18 +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
Simon
abf6723d38
[Feature][JsonSplit] modify saveProcessDefine remove the duplicate code (#4810)
* 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
2021-02-20 15:11:19 +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
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
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
lenboo
453ba09bb2 Merge branch 'json_split' of https://github.com/apache/incubator-dolphinscheduler into spilit 2021-02-18 17:29:24 +08:00
lenboo
1b9ab88e78 Merge remote-tracking branch 'upstream/dev' into spilit 2021-02-18 17:28:58 +08:00
bao liang
67eae43154
[Feature-4417][JsonSplit] refactor process dag generate (#4790)
* #4417 [JsonSplit] refactor dag generate

* #4417 [JsonSplit] refactor dag generate

* #4417 [JsonSplit] add postNodeVersion and preNodeVersion

* #4417 [JsonSplit] code style

* #4417 [JsonSplit] code style

* #4417 [JsonSplit] code style
2021-02-18 17:19:33 +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
lenboo
f7ca571f7d Merge remote-tracking branch 'upstream/dev' into spilit 2021-02-18 11:16:31 +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
lenboo
3571de972e Merge remote-tracking branch 'upstream/dev' into spilit 2021-02-17 10:39:43 +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
lenboo
d5b6f44954 Merge remote-tracking branch 'upstream/dev' into spilit 2021-02-16 10:19:38 +08:00
zhuangchong
5025b5015f
Repair dolphinscheduler-mysql.sql error sql. (#4780) 2021-02-16 10:19:27 +08:00
Shiwen Cheng
fef1a7ef21
[Fix-4760][api] Repair dolphinscheduler-postgre.sql error sql (#4774) 2021-02-15 23:38:42 +08:00
CalvinKirs
d83719f433 test 2021-02-15 12:50:24 +08:00
lenboo
9f809de693 merge from dev 2021-02-15 10:42:10 +08:00
Shiwen Cheng
5f40fce1f5
[Improvement][UI] Improve long host display in K8s (#4756) 2021-02-14 21:37:25 +08:00
Shiwen Cheng
93514ddf31
[Improvement][K8s] Improve K8s for helm (#4746) 2021-02-14 21:35:23 +08:00