ruanwenjun
68301db6b9
[Improvement][Api] Upload resource to remote failed, the local tmp file need to be cleared #5475 ( #5476 )
3 years ago
baoliang
7aa8b518ac
Merge remote-tracking branch 'upstream/dev' into json_split
...
# Conflicts:
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/master/runner/MasterExecThread.java
# dolphinscheduler-server/src/main/java/org/apache/dolphinscheduler/server/utils/DependentExecute.java
3 years ago
JinyLeeChina
515fa4912e
[Feature][JsonSplit] Fix ProcessService ut ( #5435 )
...
* Fix ProcessService ut
* codeStyle
* Fix AlertPlugin ut
* Fix AlertPlugin ut
* Fix server module ut
* Fix server module ut
* Fix api ut
* codeStyle
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
JinyLeeChina
363426de71
[Feature][JsonSplit] fix process lineage bug ( #5418 )
...
* update taskParams/add task delayTime/fix conditionType bug
* update codeStyle for merge to dev
* fix process lineage bug
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
ruanwenjun
0bdf15efb9
[Improvement][DAO] Add Unique key in t_ds_alertgroup and t_ds_datasource ( #5373 )
...
* [Improvement][DAO] Add Unique key to t_ds_worker_group t_ds_datasource
* Add exception catch
* add ddl
* fix ut
3 years ago
Hayden Zhou
2114b63216
replace access log by AccessLogAnnotation ( #5315 )
...
* replace access log by AccessLogAnnotaion
* fix codesytle error
* fix RequestContextHolder.getRequestAttributes may be null
* fix code style
* accessLogAnnotation addd ignore params
* fix style
* reduce code smells
* fix code style
* fix logtext if request is ignore
* add trance id
* fix code style
* add comment
* optimize
* fix code style
* fix code
Co-authored-by: hayden <hayden@haydendeMacBook-Pro.local>
3 years ago
ruanwenjun
cbbe9c333c
[Improvement][api-server] Update the project owner ( #5394 )
...
* [Bug][api-server] delete the user ,when query the project by join the table of t_ds_user will return null. (#5326 )
* when delete a user, do project ownership check
* fix ut
* fix vulnerability
3 years ago
JinyLeeChina
2a44cb9de6
[Feature][JsonSplit] update codeStyle for merge to dev ( #5392 )
...
* update taskParams/add task delayTime/fix conditionType bug
* update codeStyle for merge to dev
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
wen-hemin
fd54dc0ce2
[FixBug][JsonSplit] depend task, the field "process definition id" modify to "process definition code" ( #5377 )
...
* fix: depend task, the field "process definition id" modify to "process definition code"
* fix: depend task, the field "process definition id" modify to "process definition code"
Co-authored-by: wen-hemin <wenhemin@apache.com>
3 years ago
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
3 years ago
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
3 years ago
JinyLeeChina
db96bf2dfe
[Feature][JsonSplit] Fix batchMove of processDefinition bug ( #5371 )
...
* update SnowFlake
* update processDefinite from processInstance
* update processDefinite from processInstance
* Fix task logger path
* Fix dependTask bug
* Fix batchMove of processDefinition bug
* codeStyle
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
luoyuan
e57ee658e8
[Improvement] Optimized close of IO ( #5336 )
...
* [improvement]modify all methods that refer to LogClientService in the code.
* delete unused code
* [Improvement] Optimized close of IO
3 years ago
Simon
37b149da39
fix circular dependence bug ( #5330 )
3 years ago
JinyLeeChina
d60f31bcf3
[Feature][JsonSplit] update processDefinite from processInstance ( #5325 )
...
* update SnowFlake
* update processDefinite from processInstance
* update processDefinite from processInstance
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
JinyLeeChina
49b234609a
update SnowFlake ( #5321 )
...
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
wen-hemin
2a81b29b8f
fix: process instance version page bug ( #5319 )
...
Co-authored-by: wen-hemin <wenhemin@apache.com>
3 years ago
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.
3 years ago
JinyLeeChina
f7a06a033d
[Feature][JsonSplit] Fix master/worker about shellTask ( #5300 )
...
* Fix quoted bug about processDefineId of processInstance
* Fix master/worker about shellTask
* codeStyle
* codeStyle
* update taskType
* codeStyle
* update timeoutNotifyStrategy
* codeStyle
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
wen-hemin
784b3550b2
fix: The instance page DAG does not display bug ( #5298 )
...
Co-authored-by: wen-hemin <wenhemin@apache.com>
3 years ago
wenjun
7843ed4087
[Improvement][ApiServer] Traffic limit #5235 ( #5307 )
...
* [Improvement][ApiServer] Traffic limit #5235
* code style check
3 years ago
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
3 years ago
JinyLeeChina
645847c096
Fix quoted bug about processDefineId of processInstance ( #5263 )
...
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
wenjun
039d517c13
[Improvement][API] the QueryAuthorizedProject interface adds permission judgment ( #5170 ) ( #5184 )
3 years ago
Jonathan.Wei
d4812f0a34
[Fix-5250][API] Fixed data source parameter type attribute being null ( #5251 )
...
* Update DataSourceServiceImpl.java
Fixed data source parameter type attribute being null
* Fixed test case issues related to deleting the type parameter
Co-authored-by: 魏基勇 <weijiyong@ky-tech.com.cn>
3 years ago
wenjun
641dedd21e
fix dag empty msg ( #5245 )
3 years ago
wangxj3
5c898e38ed
[FIX-#5233][API] Fix bug ofREPEAT RUNNING processInstance throw exceprion ( #5234 )
...
* fix bug of REPEAT RUNNING throw exception
Co-authored-by: wangxj <wangxj31>
3 years ago
wen-hemin
cc82a98f50
[FixBug][JsonSplit] dag show bugs ( #5226 )
...
* fix: dag show bugs
* fix: code format
* fix: code format
* fix: code format
Co-authored-by: wen-hemin <wenhemin@apache.com>
3 years ago
Simon
8d6c2e3a6c
fix copy locations name error ( #5228 )
3 years ago
JinyLeeChina
a8f2894b79
[Feature][JsonSplit] Fix master/processInstance bug ( #5206 )
...
* transform taskCode from long to string
* fix process bug
* code review
* code review
* code review
* Fix master/processInstance bug
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
bao liang
86ce8f133a
[JsonSplit-4417][master/worker/api]json split- remove json in task instance. ( #5160 )
...
* [json split] refactor json in task instance
* add task_pramas in task_instance
* feature #4417 refactor json split in task instance
* code style
* code style
* code style
* code style
* code style
* update
* update
* update unit test
* update
3 years ago
Hayden Zhou
5d7dc1cb2a
[Improvement][API]optimize tenant code validation ( #5093 )
...
* optimize tenant code validation
* fix code style and test err
* fix test error, and remove duplicate tenant code validate
3 years ago
guohaozhang
6b565f0aed
[Fix-#5124] fix change fileName when reupload file ( #5125 )
3 years ago
wenjun
f20bb54896
[Improvement][API] Improvement query all project list ( #5169 ) ( #5192 )
3 years ago
JinyLeeChina
689106d114
transform taskCode from long to string ( #5174 )
...
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
JinyLeeChina
a467fffd7b
[Feature][JsonSplit] fix taskId in json ( #5165 )
...
* modify checkDAGRing and ProcessService method
* merge
* modify dagRing
* modify process instance for project home page
* fix save process bug
* codeStyle
* Fix logical bug in saving process definition
* codeSytle
* Fix bug in interface of queryProcessDefinitionList
* codeSytle
* Fix api bug"
* fix taskId in processDefinitionJson
* fix json taskId
* codeStyle
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
Simon
cd19507271
[feature][jsonsplit]fix copy/export/import processDefinition bugs ( #5146 )
...
* 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 mapper module ut
* codestyle
* fix ProcessInstanceMapperTest
* codestyle
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* fix ProcessInstanceMapperTest
* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest
* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest
* fix TaskInstanceMapperTest
* add TaskDefinitionLogMapperTest/TaskDefinitionMapperTest and bugfix
* codestyle
* codestyle
* Refactor process lineage
* Refactor process lineage
* codestyle
* codestyle
* Refactor process lineage
* Refactor process lineage
* add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest
* add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest
* add ProcessServiceTest
* 1
* 1
* fix copy/export/import processDefinition bugs
* 1
* codestyle
3 years ago
Simon
21b7b77d50
[Feature][JsonSplit]fix modifyBy field ( #5112 )
...
* 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 mapper module ut
* codestyle
* fix ProcessInstanceMapperTest
* codestyle
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* fix ProcessInstanceMapperTest
* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest
* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest
* fix TaskInstanceMapperTest
* add TaskDefinitionLogMapperTest/TaskDefinitionMapperTest and bugfix
* codestyle
* codestyle
* Refactor process lineage
* Refactor process lineage
* codestyle
* codestyle
* Refactor process lineage
* Refactor process lineage
* add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest
* add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest
* add ProcessServiceTest
* 1
* 1
* fix modifyBy field
* 1
* ut fix
3 years ago
wenjun
5d264c9f20
[Improvement][Api] Optimize query processInstanceList #5134 ( #5135 )
...
* Batch query user rather than several query
3 years ago
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>
3 years ago
JinyLeeChina
d99934d0da
[Feature][JsonSplit] Fix api bug ( #5102 )
...
* modify checkDAGRing and ProcessService method
* merge
* modify dagRing
* modify process instance for project home page
* fix save process bug
* codeStyle
* Fix logical bug in saving process definition
* codeSytle
* Fix bug in interface of queryProcessDefinitionList
* codeSytle
* Fix api bug"
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
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.
3 years ago
guohaozhang
4a6e8b7afa
[Fix-#5103] fix resource rename cause can not update ( #5107 )
3 years ago
wenjun
086e716441
[Improvement][Dao] SQL optimization - check exist #5069 ( #5070 )
3 years ago
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
3 years ago
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.
3 years ago
Simon
00dcc3f78e
[Feature][jsonsplit]add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest ( #5047 )
...
* 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 mapper module ut
* codestyle
* fix ProcessInstanceMapperTest
* codestyle
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* fix ProcessInstanceMapperTest
* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest
* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest
* fix TaskInstanceMapperTest
* add TaskDefinitionLogMapperTest/TaskDefinitionMapperTest and bugfix
* codestyle
* codestyle
* Refactor process lineage
* Refactor process lineage
* codestyle
* codestyle
* Refactor process lineage
* Refactor process lineage
* add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest
* add WorkFlowLineageMapperTest/WorkFlowLineageServiceTest
3 years ago
JinyLeeChina
d98c2c5cfe
[Feature][JsonSplit] Fix bug in interface of queryProcessDefinitionList ( #5043 )
...
* modify checkDAGRing and ProcessService method
* merge
* modify dagRing
* modify process instance for project home page
* fix save process bug
* codeStyle
* Fix logical bug in saving process definition
* codeSytle
* Fix bug in interface of queryProcessDefinitionList
* codeSytle
Co-authored-by: JinyLeeChina <297062848@qq.com>
3 years ago
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
3 years ago
Simon
22ec6c069d
[Feature][jsonsplit]Refactor process lineage ( #5034 )
...
* 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 mapper module ut
* codestyle
* fix ProcessInstanceMapperTest
* codestyle
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* conflicts solve
* fix ProcessInstanceMapperTest
* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest
* fix ProjectMapperTest/ProjectUserMapperTest/ScheduleMapperTest
* fix TaskInstanceMapperTest
* add TaskDefinitionLogMapperTest/TaskDefinitionMapperTest and bugfix
* codestyle
* codestyle
* Refactor process lineage
* Refactor process lineage
* codestyle
* codestyle
* Refactor process lineage
* Refactor process lineage
3 years ago