Commit Graph

551 Commits

Author SHA1 Message Date
Shiwen Cheng
0d065c0712
[Feature-5062][*] Create/Edit/Delete Worker Group in Web UI (#5113)
* [Improvement][Server] Rename MASTER_PREFIX to MASTER_TYPE and WORKER_PREFIX to WORKER_TYPE

* [Feature][Api&Dao] Support api and dao of worker group

* [Feature][UI] Support to create, edit and delete worker group

* [Feature][API&UI] Support work groups from database and zookeeper to display together in worker group management

* [Feature][API&Dao] Support long ip list and check request parameters when saving worker group

* [Feature][*] Refactor ipList to addrList

* [Feature][Server] Support host manager to select worker host by worker group in database

* [Improvement][Server] Improve the config of master and worker

* [Improvement][*] Rename zkRegistered to systemDefault

* [Improvement][Test] Fix unit test and improve ui

* [Improvement][Server] Improve getServerMaps

Co-authored-by: dailidong <dailidong66@gmail.com>
2021-03-23 23:47:41 +08:00
zhuangchong
ba039dc252
[Improvement][dao] Resource features SQL slow query optimization. (#4947)
* Resourse features SQL slow query optimization.

* update resource mapper queryResourcePaging method.

* split resource and resource_uesr sql statement.

* determine the size of the collection.

* update process service class code style.

* update ResourceUserMapper java class code style.

* add resourceUserMapper in the test config file.

* solve code smell

* split paging query join statement.

* update ResourceUserMapper class.

* remove sql join statement.

* update resource test class code style.

* update ResourcesServiceTest test class.

* rerun ut.

* update user service test class.

* solve query resource list method code smell.
2021-03-20 12:50:26 +08:00
guohaozhang
4a6e8b7afa
[Fix-#5103] fix resource rename cause can not update (#5107) 2021-03-19 14:51:12 +08:00
wenjun
086e716441
[Improvement][Dao] SQL optimization - check exist #5069 (#5070) 2021-03-18 22:49:12 +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
zhuangchong
705715c313
[Improvement-5059][API] Verify that the new workflow definition version is the current version before removing it #5059 (#5060)
* this process definition version is used, not allowed to delete.

* update ProcessDefinitionVersionServiceTest test class.

* update check has associated process definition sql.
2021-03-18 09:37:17 +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
Shiwen Cheng
ae608e024a
[Fix-5037][Server] Fix that both the master and the worker is hanging after restarting and stopping (#5038)
* [Fix-5037][Server] Fix that both the master and the worker is hanging after restarting and stopping

* [Improvement][*] Replace commons.lang.StringUtils with common.utils.StringUtils
2021-03-12 09:33:30 +08:00
Shiwen Cheng
beb5adb985
[Feature][MR] Support mapreduce name (#5029) 2021-03-11 12:35:08 +08:00
Shiwen Cheng
8112f5bcb5
[Fix][API] Fix KeeperException (#4961)
fix #4705
2021-03-05 21:34:54 +08:00
dddyszy
01b71f1a0d
[Fix-4839][Server] Process cannot stop when killed with retry (#4841)
* [Fix-4839][Server] Process cannot stop when killed with retry

* [Fix-4839][Server] Process cannot stop when killed with retry
2021-03-04 21:10:11 +08:00
zhuangchong
ba2bb22100
[Improvement][API] create project success return project id (#4927)
* create project success return project id.

* update return data structure
2021-03-02 18:03:59 +08:00
zhuangchong
139211f3dd
Reduce queries after successful project creation. (#4901) 2021-02-27 21:39:21 +08:00
zhuangchong
a388b6853d
Optimize HashMap Initial Capacity. (#4896) 2021-02-27 21:36:03 +08:00
zhuangchong
ffe215f685
[Fix-4816][API] The API calls the workflow instance query interface and queries all the data when the time parameter is wrong (#4817)
* fix process instance query paramter is date,date parse error.

* solve code duplication.

* update checkAndParseDateParameter call parameters.

* update instance service test.

* update check and parse date parameters method.

* update BaseService class code style.

* Update check data parameter result judgment condition.
2021-02-25 09:16:27 +08:00
WilliamChen-luckbob
e47e4a70ab
[Fix] while repeat running, the global parameters will not set to the user specified start parameters. (#4779)
* [fix]when repeat running, there are no startparams which was set in the first start

* [fix] cannot set global param while rerun process instance

* fix code format

* delete unrelated test

* Update ExecutorControllerTest.java

* fix code smell

* Update ExecutorService2Test.java

don't know why e2e failed

* replace duplicate code
2021-02-24 23:48:23 +08:00
Shiwen Cheng
149b0dab4d
[Improvement][Docker] Sync docker conf templates to the latest conf properties (#4772) 2021-02-23 14:47:10 +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
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
4c8f06002f
fix api swagger params error. (#4818) 2021-02-20 08:16:24 +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
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
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
zhuangchong
03a2c6b7b7
[Improvement-4450][datasource] Hive/Spark data sources do not support multi-tenancy when Kerberos authentication is enabled (#4593)
* hive/spark jdbc add kerberos paramter.

* update datasource vue paramter placeholder.

* update code style.

* add datasource ApiImplicitParam in the kerberos paramter.

* update constants class code style.

* add code test and code style.

* update BaseDataSourceTest code style.

* update BaseDataSourceTest class code style.

* update DataSourceController class code style.

* update DataSourceController ApiImplicitParam

* update ui create data source vue.
2021-02-06 16:57:59 +08:00
Shiwen Cheng
424497ecba
[Improvement][Api] Use WebUtils.getCookie instead of BaseService.getCookie (#4559) 2021-02-03 22:09:31 +08:00
zhuangchong
c3f6f962ca
[Improvement-4568][API] When the workflow definition name validation API fails, the system prompts that the workflow definition name already exists (#4569)
* fix dev definition api error prompt.

* imp api definition name verify message prompt.
2021-02-03 17:07:51 +08:00
zt-1997
14d49bc584
[FIX-2101]It solves the problem that the name of the branch will not change after the name of the branch is changed in the workflow page and instance page. (#4555)
Co-authored-by: zt-1997 <“18841012545@163.com”>
2021-02-02 16:07:37 +08:00
CalvinKirs
dc04f88c32 Merge branch 'dev' into alert_param_reduce 2021-01-30 13:26:02 +08:00
zt-1997
afd201e6fa
[FIX-#4592]Fix that the worker group management IP is not displayed correctly. (#4620)
Co-authored-by: zt-1997 <“18841012545@163.com”>
2021-01-29 16:54:39 +08:00
CalvinKirs
8300444f23 code style 2021-01-29 13:43:14 +08:00
CalvinKirs
6877073777 add ut 2021-01-29 13:38:44 +08:00
CalvinKirs
a1e6a0fa5c Merge branch 'dev' into alert_param_reduce
# Conflicts:
#	dolphinscheduler-api/src/main/java/org/apache/dolphinscheduler/api/service/impl/AlertPluginInstanceServiceImpl.java
2021-01-29 10:48:56 +08:00
CalvinKirs
5f23ca5dee [Improvement][alert-spi]plugin instance only saves the main information
plugin instance only saves the main information

when users need to display all the complete information (usually UI display), then do the conversion.
2021-01-29 09:50:23 +08:00
CalvinKirs
243ad386d0 [Improvement][alert-spi]plugin instance only saves the main information
plugin instance only saves the main information

when users need to display all the complete information (usually UI display), then do the conversion.
2021-01-29 00:26:19 +08:00
CalvinKirs
cd37dd8c49 code smell 2021-01-26 15:38:20 +08:00
CalvinKirs
47fcac5afd code smell 2021-01-26 15:02:26 +08:00
CalvinKirs
1622dde5db add ut 2021-01-26 14:42:36 +08:00
CalvinKirs
4e2e055e70 add ut 2021-01-26 14:41:17 +08:00
CalvinKirs
1f6634a847 return result 2021-01-26 13:34:55 +08:00
CalvinKirs
b23696c388 When the alert is executed, if the alarm group is not bound to the alert plug-in, the alert status is updated to fail. 2021-01-26 13:30:29 +08:00
CalvinKirs
be09a1bd18 Fix mybatis-plus empty value update problem
When deleting the alert-plugin instance, determine whether there is an alert group association
2021-01-26 13:18:16 +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
zhuangchong
cfa88a4a80
[Improvement-4493][api] The Process Definition interface parameter releaseState is changed to an enumeration type (#4494)
* definition code clean.

* update udp ui.

* update state.js releaseState value.
2021-01-22 22:39:58 +08:00
张旺
046940b1a0
[Improvement][API] ProjectService queryAllProjectList API optimization (#4539)
* [Improvement][API] ProjectService queryAllProjectList API optimization

* ✏️ checkStyle typo
2021-01-22 22:10:05 +08:00