baoliang
b594afc94c
Merge remote-tracking branch 'upstream/dev' into json_split
...
# Conflicts:
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/procedure/ProcedureTask.java
2021-05-07 01:38:31 +08:00
ruanwenjun
ee95d07a90
[Feature][Alert plugin] Support slack alert ( #5382 ) ( #5384 )
...
* [Feature][Alert plugin] Support slack alert (#5382 )
* fix code smell
* add markdown table
2021-04-30 10:11:32 +08:00
zhuangchong
88a07f7b55
[Feature-4093][server] Support for stored procedures and stored function calls and data source supports DB2 ( #4094 )
...
* Support for stored procedures and stored function calls and data source supports DB2.
Co-authored-by: zhuangchong <zhuangchong8@163.com>
2021-04-29 18:29:44 +08:00
baoliang
746d9eca1d
Merge remote-tracking branch 'upstream/dev' into json_split
...
# Conflicts:
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionController.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProcessDefinitionVersionServiceImpl.java
# dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/ProjectServiceImpl.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/controller/ProcessDefinitionControllerTest.java
# dolphinscheduler-api/src/test/java/org/apache/dolphinscheduler/api/service/ProcessDefinitionVersionServiceTest.java
# dolphinscheduler-common/src/main/java/org/apache/dolphinscheduler/common/model/TaskNode.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterBaseTaskExecThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/worker/task/processdure/ProcedureTask.java
# dolphinscheduler-service/src/main/java/org/apache/dolphinscheduler/service/process/ProcessService.java
2021-04-26 14:14:05 +08:00
Shiwen Cheng
6b8461e901
Revert "[Improvement][DAO] CreateDolphinScheduler ( #5357 ) ( #5358 )" ( #5383 )
...
This reverts commit b108ac43b8
.
2021-04-25 23:29:00 +08:00
ruanwenjun
e6d8da484f
[Improvement][API] Create Datasource #5083 ( #5116 )
...
* [Improvement][API] Create Datasource #5083
* Refact create/ update datasource API
* fix Code Smells
* fix code smell
* resolve code smell
* use ConnectionParam to replace BaseDatasource
* solve license
* add ut
* code check
* add ut
* fix ut coverage
* fix ut
2021-04-25 13:51:59 +08:00
Shiwen Cheng
2e1d6975fd
[Improvement][Build] Optimize long release name and remove unused nginx release and upgrade spring boot version ( #5308 )
...
* [Build] Optimize long release name and remove unused nginx release
* [Build] Upgrade spring boot version
* [Improvement] Improve code style
2021-04-25 09:55:38 +08:00
ruanwenjun
b108ac43b8
[Improvement][DAO] CreateDolphinScheduler ( #5357 ) ( #5358 )
...
* [Improvement][DAO] Create CreateDolphinScheduler (#5357 )
* add ut
* fix code smell
2021-04-23 22:03:47 +08:00
Wenjun
abdd2337b1
[Bug][worker] Fix sql task query result is empty ( #5322 ) ( #5324 )
...
* [Bug][worker] Fix sql task query result is empty (#5322 )
* add ut
* remove duplicate
* add ut
2021-04-22 12:02:32 +08:00
didiaode18
f82da57277
There is a vulnerability in postgresql 42.1.4 ,upgrade recommended #5292 ( #5318 )
...
* There is a vulnerability in postgresql 42.1.4 ,upgrade recommended #5292
2021-04-20 15:04:29 +08:00
zhuangchong
fe144e46a3
[Improvement-4898][API] the paging query interface validates page params ( #4899 )
...
* fix api list-paging method check page params.
* update process definition version class check page params.
* add ProcessInstanceControllerTest in the pom xml file.
* solve sonar exception.
* add project controller test class.
* update create project return result
* update project controller test class code style.
* update sonar problem.
* update QueueController test class.
2021-04-19 11:01:52 +08:00
Shiwen Cheng
e92e29ef9a
[Fix-5309][Common] Fix the wrong memory ( #5312 )
...
* [Fix-5309][Common] Fix the wrong memory
* [Fix-5309][Common] Fix unit test and remove unused code
2021-04-19 10:24:54 +08:00
Shiwen Cheng
94a08c8f32
[Improvement] Remove incubating ( #5305 )
2021-04-16 22:56:51 +08:00
wenjun
7843ed4087
[Improvement][ApiServer] Traffic limit #5235 ( #5307 )
...
* [Improvement][ApiServer] Traffic limit #5235
* code style check
2021-04-16 22:41:02 +08:00
Kirs
ac15f45b0b
Update the main repository link ( #5286 )
2021-04-16 10:56:48 +08:00
Shiwen Cheng
e39409a412
[Improvement-5275][Server] Fix wrong excludeFilters and move zk/ZKMasterClient and registry/ServerNodeManager into master ( #5278 )
...
* [Improvement-5275][Server] Move zk/ZKMasterClient and registry/ServerNodeManager into master
* [Improvement-5275][Server] Fix code smells
* [Improvement-5275][Server] Add ZKMasterClientTest
2021-04-16 00:17:21 +08:00
wenjun
f3dfaacca2
[Improvement][Service] Optimize query log ( #5205 )
...
* [Improvement][Service] Optimize query log
* remove IPUtils
2021-04-15 20:25:01 +08:00
Shiwen Cheng
1c1f6663a6
[Improvement][WorkerGroup] Optimize and reduce database and zookeeper queries and replace worker address input with multiple-select ( #5182 )
...
* [Improvement][Server] Optimize and reduce database and ZooKeeper query
* [Improvement][WorkerGroup] Replace worker address input with multiple-select
* [Improvement][WorkerGroup] Fix unit test
* [Improvement][API&UI] Optimize long host to short host and long host display in k8s
2021-04-14 21:39:39 +08:00
wenjun
cc7a4446f5
[Improvement][Task] DataX Node doesn't Support Clickhouse as datasource ( #5180 ) ( #5243 )
...
* [Improvement][Module Name] DataX Node doesn't Support Clickhouse as the datasource (#5180 )
* add ut
* add ut
* resolve code smell
2021-04-14 11:31:40 +08:00
lenboo
c8ac6f99fe
Merge remote-tracking branch 'upstream/dev' into spilit
...
# Conflicts:
# dolphinscheduler-common/src/main/resources/common.properties
2021-03-30 11:31:42 +08:00
wenjun
a8b47e1d4f
[Bug][Master] Typo in MasterConfig #5141 ( #5142 )
2021-03-26 09:47:21 +08:00
lenboo
010b49c933
merge from dev
2021-03-22 15:18:16 +08:00
Shiwen Cheng
8ac72e80e6
[Feature-5087][SqlTask] Add a switch to send mail and print head logs in SqlTask ( #5088 )
...
* [Feature-5087][SqlTask] Add the switch to send mail and print head logs in SqlTask
* [Feature-5087][SqlTask] Add SqlParametersTest
2021-03-19 15:07:39 +08:00
Shiwen Cheng
5856a12855
[Improvement-4984][Worker] Refactor and Improve worker load balance ( #4996 )
...
* [Improvement][Remote] Improve unit tests
* [Improvement][Worker] Improve worker load balance
* [Improvement][Worker] Fix code smells
* [Improvement][Worker] Rename weight to hostWeight
2021-03-18 10:03:58 +08:00
lenboo
cf63fc1fee
Merge remote-tracking branch 'upstream/dev' into spilit
2021-03-16 15:50:06 +08:00
Kirs
6bf5031f45
[FIX] fix MySQL datasource jdbc connect parameters ( #4851 )
...
* [FIX-CVE-2020-11974] fix MySQLDataSource Security
* remove useless code
* add ut
* A more reasonable way
* code style
* fix test error
* code style
* update exception msg
2021-03-16 14:40:07 +08:00
lenboo
a574d2e38c
Merge remote-tracking branch 'upstream/dev' into spilit
2021-03-12 10:44:43 +08:00
wenjun
ea6b1de120
[Improvement][worker] Optimize KillYarnJob (4939) ( #4943 )
2021-03-11 22:13:44 +08:00
lenboo
6ef54ebe9b
Merge remote-tracking branch 'upstream/dev' into spilit
2021-03-11 17:01:29 +08:00
Shiwen Cheng
beb5adb985
[Feature][MR] Support mapreduce name ( #5029 )
2021-03-11 12:35:08 +08:00
Simon
bd4b2f85a9
[Feature][jsonsplit]add ProcessTaskRelationServiceImplTest/TaskDefinitionServiceImplTest ( #4949 )
...
* 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
* modify import/export processdefinition, add genProcessData
* fix ut and bug
* code style
* repalce project_id with code
* conflicts solve
* conflicts solve
* conflicts solve
* bugfix
* modify listResources mothod and remove getResourceIds mothod
* 1
* conflicts solve
* modify listResources mothod and remove getResourceIds mothod
* modify listResources mothod and remove getResourceIds mothod
* replace processDefinitionVersion with processDefinitionLog
* codestyle
* codestyle
* add ProcessTaskRelationServiceImplTest/TaskDefinitionServiceImplTest
* conflicts solve
* conflicts solve
* conflicts solve
* add ProcessTaskRelationServiceImplTest/TaskDefinitionServiceImplTest
* codestyle
2021-03-06 10:56:49 +08:00
zhuangchong
5bfe3fca67
[Fix][SqlTask] fix hive sqltask invalid connection parameters. ( #4917 )
...
* fix hive sqltask invalid connection parameters.
* add setConnParams test method.
* update base datasource test class code style.
* add BaseDataSourceTest in the pom xml.
* update hive conf list jdbc url stitching.
* update hive datasource test class.
2021-03-03 09:15:37 +08:00
lgcareer
43ba29a2dd
[Improvement-4624] When the server exist in the dead server list of zk,need stop service byself ( #4626 )
...
* [Improvement-4624] When the server exist in the dead server list of zk,need stop service byself
* [Improvement-4624]fix check style and add MaterRegistryTest
* [Improvement-4624]fix check style and add ZookeeperRegistryCenterTest
* [Improvement-4624]fix check style and add ZookeeperRegistryCenterTest
* [Improvement-4624]add RegisterOperatorTest
* [Improvement-4624]update RegisterOperatorTest
* [Improvement-4624]resolve code smell
* [Improvement-4624]revert LICENSE-@form-create-element-ui
2021-03-02 14:05:00 +08:00
CalvinKirs
b4c7e35340
Merge branch 'dev' into rpc
...
# Conflicts:
# tools/dependencies/known-dependencies.txt
2021-02-26 18:10:49 +08:00
Kirs
a9e1d316f5
[Improvement][SPI]Migrate related classes loaded by SPI classes to public modules ( #4586 )
...
* Migrate related classes loaded by SPI classes to public modules
* Migrate related classes loaded by SPI classes to public modules
* remove guava
* update guava
* update guava
* move to common model
* code style
* code style
* resolved conflicting file
* remove ignore test
* add jar
* fix ut error
* fix test
* fix error
* test
* exclude asm、resolver、aether-api
* code style
* remove default plugin jar config
* add LICENSE file
* add version
* add version
* remove ignore ut
* fix ut error
* add ut
* code style
* add license
2021-02-25 11:39:46 +08:00
dailidong
551759965d
Merge pull request #4743 from apache/params-trans
...
[Feature-3805][mater-worker-ui] The implement of passing variables between tasks
2021-02-23 19:06:13 +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
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
Shiwen Cheng
53598fdd18
[Fix-3298][K8s] Fix task log disappear after recreating or upgrading helm release ( #4755 )
...
* [Improvement][K8s] Alter column host varchar(15) to varchar(135) for long host
* [Improvement][K8s] Improve getHost and getAddr in NetUtils
* [Improvement][K8s] Replace getHost with getAddr
2021-02-14 21:33:45 +08:00
CalvinKirs
dad9436992
Merge branch 'dev' into rpc
2021-02-09 12:00:08 +08:00
felix.wang
d80f0614ef
[Feature-#4350][Alert]support feishu plugin ( #4594 )
...
* feishu robot
* Add Feishu to the plugin packing process
2021-01-29 22:41:13 +08:00
CalvinKirs
4e2e055e70
add ut
2021-01-26 14:41:17 +08:00
CalvinKirs
958d2fd66d
add license
2021-01-25 22:25:36 +08:00
CalvinKirs
a97f781884
add license
2021-01-25 22:08:00 +08:00
CalvinKirs
9f58eb7ea5
add rpc config
2021-01-25 21:40:12 +08:00
cooper
a5f31b75ab
[Improvement-4506][LICENSE] upgrade the version of the commons-beanutils ( #4525 )
...
* [Fix-3233][api-server] Fix the bug when compile the code in Java9 env
* [Fix-3233][api-server] Fix the bug when compile the code in Java9 env
* [Fix-3233][api-server] Fix the bug when compile the code in Java9 env
* [Fix-3233][api-server] rollback
* [Fix-3233][api-server] delete release-docs/licenses/LICENSE-jsp-api-2.1-6.1.14.txt
* [Fix-3233][api-server] delete ant-1.6.5.jar core-3.1.1.jar jsp-api-2.1-6.1.14.jar
* [Fix-3233][api-server] delete LICENSE-ant-1.6.5.txt,LICENSE-core-3.1.1.txt
* [Fix-3233][api-server] delete maven repository address of ant-1.6.5.jar ,core-3.1.1.jar ,jsp-api-2-1-6.1.14.jar
* [DS-4506][LICENSE] upgrade the version of the commons-beanutils
* [DS-4506][LICENSE] upgrade the version of the commons-beanutils
* [DS-4506][LICENSE] upgrade the version of the commons-beanutils
Co-authored-by: 李长福 <changfu.li@dmall.com>
2021-01-25 13:43:06 +08:00
CalvinKirs
230f3a30d2
add rpc config
2021-01-24 21:59:25 +08:00
Shiwen Cheng
0b8fcac37b
[Fix-4439][*] Fix cors problem ( #4490 )
...
* [Fix][UI] Fix warning in npm install
* [Fix-4439][*] Fix CORS problem
* [Improvement][API] Improve locale change interceptor
* [Improvement][API] Add test for locale change interceptor
* [Improvement][API] Fix code style
* [Improvement][Build] Update .gitignore
2021-01-24 15:41:58 +08:00
Kirs
1c5abbb2ae
Merge branch 'dev' into alert_plugin_design
2021-01-22 18:16:23 +08:00