Commit Graph

118 Commits

Author SHA1 Message Date
break60
aa650b4426
Worker group parameter modification (#2188)
* Delete worker group management page

* Modify workgroupid parameter name

* Worker group parameter modification
2020-03-16 11:33:04 +08:00
break60
290772dfaa
Modify workgroupid parameter name (#2105)
* Delete worker group management page

* Modify workgroupid parameter name
2020-03-08 15:59:13 +08:00
qiaozhanwei
2bb5ebaf3a
add TaskInstanceCacheManager receive Worker report result,modify master polling db transfrom to cache (#2021)
* 1, master persistent task
2. extract  master and worker communication model

* 1, master persistent task
2. extract  master and worker communication model

* 1, master persistent task
2. extract  master and worker communication model

* add license

* modify javadoc error

* TaskExecutionContext create modify

* buildAckCommand taskInstanceId not set modify

* java doc error modify

* add comment

* ExecutorManager interface add generic type

* add TaskInstanceCacheManager receive Worker report result

* TaskInstance setExecutePath

* add TaskInstanceCacheManager to receive Worker Task result report

* TaskInstanceCacheManager add remove method

* add license

* add dispatcht task method

* AbstractCommandExecutor remove db access

* AbstractCommandExecutor remove db access

* AbstractCommandExecutor remove db access

* AbstractCommandExecutor remove db access

* AbstractCommandExecutor remove db access

* AbstractCommandExecutor remove db access

* AbstractCommandExecutor remove db access
2020-02-26 18:46:05 +08:00
zhukai
afd5c75cd2
Fix the bug #1968. (#1969)
When create a new task or edit an exist task.The task details window will be open.
Then if delete the task node or click the DataSource menu. And the task details window still open.

The task details window should be close.
2020-02-17 19:09:10 +08:00
Yelli
d937a6ae94 Add modify user name for process definition (#1919)
* class overrides equals() and should therefore also override hashCode()

* #1862 add modify user in process difinition list

* #1862 add pg-1.2.2 ddl.sql

* modify ScriptRunnerTest

* add updateProessDifinition UT

* modify updateProcessDifinition UT

* modify updateProcessDifinition UT

* modify mysql 1.2.2 ddl.sql&dml.sql

* add scope test to mysql in pom

* modify pg-1.2.2 ddl.sql
2020-02-10 16:37:51 +08:00
zhukai
bcc734713b Newfeature for #1675. (#1908)
Continue to finish the rest works, add the cache feature for dependence,mr,python,sub_process,procedure and shell.
2020-02-10 14:15:20 +08:00
魔方不在手
f942e5ced3
[feature] data synchronization function (#1881)
* feature:data synchronization function

* feature:data synchronization function

* feature:data synchronization function

* fix:add license

* fix:resource close bug

* fix:remove class author

* fix:Improve test coverage

* fix:add UT

* fix:add UT

* fix:data sync node renamed to datax

* fix:add UT

* fix: UT bug

* fix:Optimize variable name

* fix:pom

* fix:Variable name error

* fix:optimize the code
2020-02-06 09:29:23 +08:00
break60
9549910fcc Fix UDF function list delete data without refresh and page data display widened #1851 (#1853)
* fix udfs assignment and task instance page jump #1789

* jest add coverage display

* Fix data echo, style, popup cannot be closed and license

* Fix data echo, style, popup cannot be closed and license

* fix

* Requests the previous page when there is no data on the list page

* Fix DAG task nodes keep requesting API and tooltip background color modification

* Modify list tooltip theme color

* Fix UDF function list delete data without refresh and page data display widened
2020-01-19 11:59:06 +08:00
break60
60bb2deb2a Modify list tooltip theme color (#1845)
* fix udfs assignment and task instance page jump #1789

* jest add coverage display

* Fix data echo, style, popup cannot be closed and license

* Fix data echo, style, popup cannot be closed and license

* fix

* Requests the previous page when there is no data on the list page

* Fix DAG task nodes keep requesting API and tooltip background color modification

* Modify list tooltip theme color
2020-01-17 15:02:47 +08:00
老佛爷
1c77708a89 Supplementary data by schedule (#1830)
* Supplementary data by schedule

* fix sonar check bug

* fix code duplicated blocks

* ut

* loop by day

* MasterExecThread test

* test add licene

Co-authored-by: dailidong <dailidong66@gmail.com>
2020-01-16 15:33:00 +08:00
break60
5739afb95a Fix DAG task nodes keep requesting API and tooltip background color modification (#1837)
* fix udfs assignment and task instance page jump #1789

* jest add coverage display

* Fix data echo, style, popup cannot be closed and license

* Fix data echo, style, popup cannot be closed and license

* fix

* Requests the previous page when there is no data on the list page

* Fix DAG task nodes keep requesting API and tooltip background color modification
2020-01-16 11:27:43 +08:00
zhukai
be4fa728e9 fix the bug #1816 (#1834) 2020-01-15 13:56:02 +08:00
break60
d02422d030 Requests the previous page when there is no data on the list page(#1768) (#1832)
* fix udfs assignment and task instance page jump #1789

* jest add coverage display

* Fix data echo, style, popup cannot be closed and license

* Fix data echo, style, popup cannot be closed and license

* fix

* Requests the previous page when there is no data on the list page
2020-01-15 13:55:25 +08:00
zhukai
512e7c1f6a fix bug, add the cache logic in getInstancedetail. (#1814) 2020-01-15 11:26:57 +08:00
zhukai
289ae6ac96 Implements the spark and flink type task, now they can be cache the previous input. (#1795) 2020-01-13 10:18:43 +08:00
break60
24f362de5a fix udfs assignment and task instance page jump #1789 (#1792)
* fix udfs assignment and task instance page jump #1789

* jest add coverage display

* Fix data echo, style, popup cannot be closed and license

* Fix data echo, style, popup cannot be closed and license

* fix
2020-01-13 10:12:09 +08:00
break60
b6d6bb6416 Fixed some input box length restrictions and udfs not getting values #109 (#1778)
* Fix api url

* Fixed DAG zoom in and zoom out nodes separated from arrows

* Fix front-end code specifications

* Fix front-end code specifications

* Fix front-end code specifications

* jest unit test demo

* jest unit test demo

* Fix delete operation, no query interface request is made on the list page

* Fix delete operation, no query interface request is made on the list page

* Fixed some input box length restrictions and udfs not getting values
2020-01-09 10:18:45 +08:00
break60
74a5506b9a Fix delete operation, no query interface request is made on the list page #1768 (#1777)
* Fix api url

* Fixed DAG zoom in and zoom out nodes separated from arrows

* Fix front-end code specifications

* Fix front-end code specifications

* Fix front-end code specifications

* jest unit test demo

* jest unit test demo

* Fix delete operation, no query interface request is made on the list page

* Fix delete operation, no query interface request is made on the list page
2020-01-08 19:35:27 +08:00
elonlo
03ef394399 fixbug: login interface cannot jump to home interface (#1765) 2020-01-08 11:51:01 +08:00
break60
995b5ca4a1 jest unit test demo (#1760)
* Fix api url

* Fixed DAG zoom in and zoom out nodes separated from arrows

* Fix front-end code specifications

* Fix front-end code specifications

* Fix front-end code specifications

* jest unit test demo

* jest unit test demo
2020-01-08 10:40:40 +08:00
zhukai
2087f464fb Implements the sql type task, now it can be cache the previous input. (#1745) 2020-01-07 21:59:50 +08:00
break60
b8fa7dac9d Fix front-end code specifications (#1726)
* Fix api url

* Fixed DAG zoom in and zoom out nodes separated from arrows

* Fix front-end code specifications

* Fix front-end code specifications

* Fix front-end code specifications
2020-01-07 10:36:43 +08:00
Jave-Chen
d3d9619738 Fix sonarcloud analysis on merge PR (#1707)
* #1706 fix sonarcloud analysis on merge PR

* sonarcloud use cobertura report and don't run UT again; include ui source file; merge to one workflow
2020-01-06 10:36:43 +08:00
zhukai
cfe174293f Improve the user experience in the task definition page (#1678)
define the architecture (include actions.js, dag.vue,formModel.vue,mutations.js, and state.js) and implement one of the tasks , such as http.vue.
2020-01-03 21:07:22 +08:00
break60
3477d28de8 Fixed DAG zoom in and zoom out nodes separated from arrows #1679 (#1680)
* Fix api url

* Fixed DAG zoom in and zoom out nodes separated from arrows
2020-01-03 17:50:05 +08:00
Yelli
26ed786c4d #1544 fix bug: workflow import (#1676)
* modify FileUtils.readFile2Str

* #1300 Add right alignment function in sql email content

* cancel formatted for alert_mail_template.ftl

* #747 sql task password Log desensitization

* cancel mail_temple

* edit ExcelUtils

* modify test method name

* #747 sql task password Log desensitization

* #1544 workflow import

* Constants add DATASOURCE_PASSWORD_REGEX

* #747 sql task password Log desensitization

* deal with import project have sub process

* modify export process addTaskNodeParam method name

* add testAddTaskNodeSpecialParam UT

* add ProcessDefinitionServiceTest-ut to pom

* add testImportSubProcess in ProcessDefinitionServiceTest

* add testImportSubProcess in ProcessDefinitionServiceTest

* add testImportProcessDefinition
2020-01-02 19:45:05 +08:00
break60
22a2d43d7c Fix api url (#1672) 2020-01-02 10:25:09 +08:00
break60
426c027ddf Click the run button to add the workflow name echo #1339 Point 11 (#1638)
* Increase script text box to zoom in and fix log loading

* Timing operation adds default value for start and end dates

* Click the run button to add the workflow name echo
2019-12-30 18:11:14 +08:00
break60
779decc96d Increase script text box to zoom in and fix log loading #1547 、#1247 (#1604)
* Increase script text box to zoom in and fix log loading

* Timing operation adds default value for start and end dates
2019-12-29 10:23:10 +08:00
lgcareer
9de928ea04 add profile nginx in order to deploy frontend (#1599)
* add profile nginx

* add dolphinscheduler-nginx.xml
2019-12-27 15:00:55 +08:00
break60
026fdd9e1c License Corrected Version (#1565)
* Password verification and v-for add key

* DAG automatic layout

* combo.js replacement

* combo.js replacement

* webpack upgrade to 4

* packjson has a file name that has not changed

* Solve jertty packing garbled

* Modify dashboard color

* Remove iconfont, awesome, replace with ans-ui icon

* Menu arrow style fix

* Script input box style fix

* console.log('Front-end third-party js, css introduced using npm

* Front-end supplemental license

* Modify naming

* Repair license

* replace cookie.js with js-cookie, add js-cookie license

* License Corrected Version

* License Corrected Version
2019-12-25 12:26:28 +08:00
break60
b4daa85f20 replace cookie.js with js-cookie, add js-cookie license (#1561)
* Password verification and v-for add key

* DAG automatic layout

* combo.js replacement

* combo.js replacement

* webpack upgrade to 4

* packjson has a file name that has not changed

* Solve jertty packing garbled

* Modify dashboard color

* Remove iconfont, awesome, replace with ans-ui icon

* Menu arrow style fix

* Script input box style fix

* console.log('Front-end third-party js, css introduced using npm

* Front-end supplemental license

* Modify naming

* Repair license

* replace cookie.js with js-cookie, add js-cookie license
2019-12-25 10:32:17 +08:00
break60
57aafc1507 Front-end supplemental license (#1548)
* Password verification and v-for add key

* DAG automatic layout

* combo.js replacement

* combo.js replacement

* webpack upgrade to 4

* packjson has a file name that has not changed

* Solve jertty packing garbled

* Modify dashboard color

* Remove iconfont, awesome, replace with ans-ui icon

* Menu arrow style fix

* Script input box style fix

* console.log('Front-end third-party js, css introduced using npm

* Front-end supplemental license

* Modify naming
2019-12-24 17:10:16 +08:00
break60
6837bedce8 Front-end third-party js, css introduced using npm (#1546)
* Password verification and v-for add key

* DAG automatic layout

* combo.js replacement

* combo.js replacement

* webpack upgrade to 4

* packjson has a file name that has not changed

* Solve jertty packing garbled

* Modify dashboard color

* Remove iconfont, awesome, replace with ans-ui icon

* Menu arrow style fix

* Script input box style fix

* console.log('Front-end third-party js, css introduced using npm
2019-12-24 14:31:45 +08:00
break60
15a402a3f2 Script input box style fix (#1538)
* Password verification and v-for add key

* DAG automatic layout

* combo.js replacement

* combo.js replacement

* webpack upgrade to 4

* packjson has a file name that has not changed

* Solve jertty packing garbled

* Modify dashboard color

* Remove iconfont, awesome, replace with ans-ui icon

* Menu arrow style fix

* Script input box style fix
2019-12-22 23:40:01 +08:00
break60
99fc87f911 Menu arrow style fix (#1531)
* Password verification and v-for add key

* DAG automatic layout

* combo.js replacement

* combo.js replacement

* webpack upgrade to 4

* packjson has a file name that has not changed

* Solve jertty packing garbled

* Modify dashboard color

* Remove iconfont, awesome, replace with ans-ui icon

* Menu arrow style fix
2019-12-20 18:42:01 +08:00
break60
b859be489d Remove iconfont, awesome, replace with ans-ui icon (#1527)
* Password verification and v-for add key

* DAG automatic layout

* combo.js replacement

* combo.js replacement

* webpack upgrade to 4

* packjson has a file name that has not changed

* Solve jertty packing garbled

* Modify dashboard color

* Remove iconfont, awesome, replace with ans-ui icon
2019-12-20 12:54:40 +08:00
break60
4c88d0442c Modify dashboard color (#1521)
* Password verification and v-for add key

* DAG automatic layout

* combo.js replacement

* combo.js replacement

* webpack upgrade to 4

* packjson has a file name that has not changed

* Solve jertty packing garbled

* Modify dashboard color
2019-12-20 10:25:25 +08:00
break60
8fa8cb559a Solve jertty packing garbled (#1518)
* Password verification and v-for add key

* DAG automatic layout

* combo.js replacement

* combo.js replacement

* webpack upgrade to 4

* packjson has a file name that has not changed

* Solve jertty packing garbled
2019-12-18 23:03:49 +08:00
break60
9b4d0c3a9a combo.js changes and webpack upgrade to 4.X (#1513)
* Password verification and v-for add key

* DAG automatic layout

* combo.js replacement

* combo.js replacement

* webpack upgrade to 4

* packjson has a file name that has not changed
2019-12-18 18:38:32 +08:00
lgcareer
ab09ed4396 merge frontend and backend tar into one binary tar (#1511) 2019-12-18 16:27:34 +08:00
lgcareer
5404ff2508 change npm run build:combined to npm burn build:release (#1504) 2019-12-18 10:49:13 +08:00
break60
da1afb7a04 DAG automatic layout (#1497)
* Password verification and v-for add key

* DAG automatic layout
2019-12-17 17:31:25 +08:00
Yelli
4d8d74ac18 #839 enhancement : add Spark Task Component can switch Spark Version (#1494)
* add Spark Version in Spark Component

add Spark Version in Spark Component

* add license for SparkVersion.class

add license

* 1 add spark task UT
2 add spark version param check

* add assert check for sparkTaskTest
2019-12-17 11:33:11 +08:00
zhukai
cb659ab1af [Feature] Improve user experience in datasource page (#1471)
To improve user experience in datasource page, add default port for each type database.

1. When create or edit datasource, there is a default vaule for port. If user changes type, the default value changes.
2. Use local variables in browser memory, to cache user previous input port for each type. For example :
	     time-a:  MySQL default  port is 3306 , user change 3306 to 4000.
         time-b:  User change type from MySQL to ClickHouse , the port change  from 4000 to 8123.
         time-c:  User change type from ClickHouse back to MySQL,the port change from 8123 to 4000,use previous input cache to fillback.

3. In edit datasource page, when the page first loads, use the query value fillback instead of default value.
2019-12-16 11:03:59 +08:00
zhukai
0a8b6bcb81 change maxlength from 128 to 256 (#1451) 2019-12-12 14:08:35 +08:00
break60
446adb2485 Password verification and v-for add key (#1440) 2019-12-11 14:28:23 +08:00
bao liang
a5277827f2 merge dev-db to dev (#1426)
* [dolphinscheduler-1345] [newfeature] Add DB2 Datasource (#1391)

* Fix the problem that the 'queueId' is not present when creating a tenant based on the default queue. (#1409)

* dolphinscheduler-#1403][bug]improve the check rules (#1408)

1. When check failed, we don’t know whitch parameter has is wrong, Because username、password、email and phone were checks together. I refactored the check method ,Now it will return failed msg by each field.
2. The email check regex support [_|\-|\.]?) in createUser.vue, But it do not support in backend server , I fix it, Now they have the same check regex both in frontend and backend

* jcip-annotations define version information and maven-assembly-plugin add groupId (#1413)

* "v-for" add key (#1419)

* [dolphinscheduler-#1397] [bug]Resources can not be previewed or updated  (#1406)

When create an resource the name will add the suffix, But When rename the resource there is no suffix add to the name, So When update resource name without suffix just like "test.sh" => "test" , Then the bug reproduced.

To fix this bug i add the logic bellow:
When rename, if the name without suffix then add it ,else use the origin name

* simply server module configs (#1424)

* move updateTaskState into try/catch block in case of exception

* fix NPE

* using conf.getInt instead of getString

* for AbstractZKClient, remove the log, for it will print the same log message in createZNodePath.
for AlertDao, correct the spelling.

* duplicate

* refactor getTaskWorkerGroupId

* add friendly log

* update hearbeat thread num = 1

* fix the bug when worker execute task using queue. and remove checking Tenant user anymore in TaskScheduleThread

* 1. move verifyTaskInstanceIsNull after taskInstance
2. keep verifyTenantIsNull/verifyTaskInstanceIsNull clean and readable

* fix the message

* delete before check to avoid KeeperException$NoNodeException

* fix the message

* check processInstance state before delete tenant

* check processInstance state before delete worker group

* refactor

* merge api constants into common constatns

* update the resource perm

* update the dataSource perm

* fix CheckUtils.checkUserParams method

* update AlertGroupService, extends from BaseService, remove duplicate methods

* refactor

* modify method name

* add hasProjectAndPerm method

* using checkProject instead of getResultStatus

* delete checkAuth method, using hasProjectAndPerm instead.

* correct spelling

* add transactional for deleteWorkerGroupById

* add Transactional for deleteProcessInstanceById method

* change sqlSessionTemplate singleton

* change sqlSessionTemplate singleton and reformat code

* fix unsuitable error message

* update shutdownhook methods

* fix worker log bug

* fix api server debug mode bug

* upgrade zk version

* delete this line ,for zkClient.close() will do the whole thing

* fix master server shutdown error

* degrade zk version and add FourLetterWordMain class

* fix PathChildrenCache not close

* add Transactional for createSession method

* add more message for java-doc

* delete App, let spring manage connectionFactory

* add license

* add class Application for test support

* refactor masterServer and workerServer

* add args

* fix the spring transaction not work bug

* remove author

* delete @Bean annotation

* delete master/worker properties

* updates

* rename application.properties to application-dao.properties

* delete this class

* delete master/worker properties and  refactory master/worker

* delete unused imports

* merge

* delete unused config
2019-12-10 11:20:20 +08:00
baoliang
18e2f753eb merge from dev-db 2019-12-05 20:14:23 +08:00
qiaozhanwei
c25a9b0b21 Revert "merge from dev-db (#1386)" (#1404)
This reverts commit 1baa1f4279.
2019-12-05 17:35:53 +08:00