Commit Graph

61 Commits

Author SHA1 Message Date
Tboy
b5aab02da9 degrade zk version and add FourLetterWordMain class (#1183)
* 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
2019-11-08 15:58:49 +08:00
Tboy
61502e7743 fix api server debug mode bug (#1157)
* 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
2019-11-06 19:14:37 +08:00
lgcareer
dfa7995561 change mysql-connector-java scope to test (#1161)
* rename from DatasourceUserMapper to DataSourceUserMapper

* add unit test in UserMapper and WorkerGroupMapper

* change cn.escheduler to org.apache.dolphinscheduler

* add unit test in UdfFuncMapperTest

* add unit test in UdfFuncMapperTest

* remove DatabaseConfiguration

* add ConnectionFactoryTest

* cal duration in processInstancesList

* change desc to description

* change table name in mysql ddl

* change table name in mysql ddl

* change escheduler to dolphinscheduler

* change escheduler to dolphinscheduler

* change escheduler to dolphinscheduler

* remove log4j-1.2-api and modify AlertMapperTest

* remove log4j-1.2-api

* Add alertDao to spring management

* Add alertDao to spring management

* get SqlSessionFactory from MybatisSqlSessionFactoryBean

* get processDao by DaoFactory

* read druid properties in ConneciontFactory

* read druid properties in ConneciontFactory

* change get alertDao by spring to DaoFactory

* add log4j to resolve #967

* resole verify udf name error and delete udf error

* Determine if principal is empty

* Determine whether the logon user has the right to delete the project

* Fixed an issue that produced attatch file named such as ATT00002.bin

* fix too many connection in upgrade or create

* fix NEED_FAULT_TOLERANCE and WAITTING_THREAD count fail

* Added a judgment on whether the currently login user is an administrator

* fix update udf database not change and create time is changed

* add enterprise.wechat.enable to decide whether to send enterprise WeChat

* change method check

* Remove the administrator's judgment on query access token list

* only admin can create worker group

* delete alert group need delete the relation of user and alert group

* add timeout in proxy when upload large resource

* add gets scheduled times by expect fire times

* add gets scheduled times by expect fire times

* Increase the judgment of whether it is admin

* Increase the judgment of whether it is admin

* when delete access token add whether login user has perm to delete

* change mysql-connector-java scope to test
2019-11-05 16:27:17 +08:00
bao liang
2c35dcf6ef change mybatisplus version to 3.2.0 (#1110)
* update english documents

* refactor zk client

* update documents

* update zkclient

* update zkclient

* update documents

* add architecture-design

* change i18n

* update i18n

* update english documents

* add architecture-design

* update english documents

* update en-US documents

* add architecture-design

* update demo site

* add mybatis plus model

* modify mybatisplus

* modify mybatisplus

* change interface by mybatisplus

* add unit test

* refactor dao interface.

* add unit test for dao...

* add unit test for dao...

* add unit test for dao...

* Merge remote-tracking branch 'upstream/dev-db' into dev-db

# Conflicts:
#	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
#	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
#	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
#	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
#	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java

* Merge remote-tracking branch 'upstream/dev-db' into dev-db

# Conflicts:
#	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectMapper.xml
#	dolphinscheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ScheduleMapper.xml
#	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProcessInstanceMapper.xml
#	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/ProjectUserMapper.xml
#	escheduler-dao/src/main/resources/cn.escheduler.dao.mapper/QueueMapper.xml
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProcessInstanceMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ProjectUserMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/QueueMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ResourceUserMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/ScheduleMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/SessionMapperTest.java
#	escheduler-dao/src/test/java/cn/escheduler/dao/mapper/TenantMapperTest.java

* Merge remote-tracking branch 'upstream/dev-db' into dev-db

# Conflicts:
#	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
#	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
#	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml

* update some dao bugs

* update for some bugs

* update some bugs

* Merge remote-tracking branch 'upstream/dev-db' into dev-db

# Conflicts:
#	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ProjectMapper.xml
#	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/ResourceMapper.xml
#	dolphinscheduler-dao/src/main/resources/org/apache/dolphinscheduler/dao/mapper/TaskInstanceMapper.xml

* update

* update

* add multiply settings for application.yml

* add multiply settings for application.yml

* revert

* update configuration settings in task record dao...

* change application_master to application-master

* change application_master to application-master

* update application.yml to application.properties

* revert

* revert

* add properties

* add properties

* revert

* revert

* add api start up..
add alert send try catch

* update dao info level

* fix bug: task cannot submit when recovery failover

* fix bug: task cannot submit when recovery failover

* merge from dev-db

* revert

* revert

* fix bug: get process definition list failed.

* fix bug: process instance interval is error

* revert

* revert

* update

* support stop submit success tasks

* update kill process

* update for stop process

* update for stop process

* add some logs for stop process

* update for small bug.

* add check strategy before submit task

* revert

* update

* update

* revert

* wait task instance exists if null.

* revert

* update

* change desc to description.

* add check user and definitions function when delete tenant

* update

* change desc to description.

* change desc to description.

* change desc to description.

* remove check resources when delete tenant

* change desc to description.

* change mybatisplus version to 3.2.0

* update
2019-10-28 20:37:23 +08:00
lidongdai
67660ab2bb Merge remote-tracking branch 'upstream/dev-db' into dev-db 2019-10-25 00:04:33 +08:00
lidongdai
1cd77fe048 add apache parent 2019-10-25 00:04:08 +08:00
khadgarmage
0200b94735 Optimize ci (#1085)
* opimize ci

fix dag flink image link bug

* revert package.json
2019-10-24 10:45:33 +08:00
khadgarmage
a072b3f2e9 license check whitelist 3rd.css (#1050) 2019-10-17 20:02:22 +08:00
khadgarmage
3162cccd43 license check (#1016) 2019-10-15 19:48:28 +08:00
qiaozhanwei
38f38457fa remove pom package resources (#988)
* add ConnectionFactoryTest and ConnectionFactory read datasource from appliction.yml

* .escheduler_env.sh to dolphinscheduler_env.sh

* dao yml assembly to conf directory

* table name modify

* entity title table  name modify

* logback log name modify

* running through the big process

* running through the big process error modify

* logback log name modify

* data_source.properties rename

* logback log name modify

* install.sh optimization

* install.sh optimization

* command count modify

* command state update

* countCommandState sql update

* countCommandState sql update

* remove application.yml file

* master.properties modify

* install.sh modify

* install.sh modify

* api server startup modify

* the current user quits and the session is completely emptied. bug fix

* remove pom package resources
2019-10-11 19:18:14 +08:00
qiaozhanwei
d09a2d07c9 rename project and doc 2019-09-29 15:14:10 +08:00
bao liang
ef4ec213e3 add mybatis plus (#881)
* update english documents

* refactor zk client

* update documents

* update zkclient

* update zkclient

* update documents

* add architecture-design

* change i18n

* update i18n

* update english documents

* add architecture-design

* update english documents

* update en-US documents

* add architecture-design

* update demo site

* add mybatis plus model

* modify mybatisplus

* modify mybatisplus

* change interface by mybatisplus
2019-09-25 18:55:02 +08:00
iture123
46d0baf6a9 Update pom.xml (#854)
update fastjson version,the lower version has a security bug.
2019-09-23 10:25:59 +08:00
Kevin Ratnasekera
f6ef6e2f9d Refactor hardcoded versions in parent pom (#773) 2019-09-16 11:05:57 +08:00
lgcareer
8fbb11c1ee upgrade commons-email from 1.2 to 1.5 and remove mail-1.4.5.jar (#744)
* Remove useless dependencies and add jsp-2.1-6.1.14

* Determine if principal is empty in getJdbcUrl method

* fix bug  when register worker but create master node in zookeeper

* Remove useless dependencies such as hive-shims and log4j

* upgrade commons-email from 1.2 to 1.5 and remove mail-1.4.5.jar
2019-08-29 10:36:16 +08:00
dailidong
1e6d6b5fb9
Merge pull request #733 from dailidong/dev
add embedded h2 db and jacoco report plugin for jenkins
2019-08-23 17:07:28 +08:00
lidongdai
ead6d7b5d2 add embedded h2 db
add jacoco report plugin for jenkins
2019-08-23 17:04:54 +08:00
lgcareer
d716ee4bd5 Remove useless dependencies and add jsp-2.1-6.1.14 (#720)
* Remove useless dependencies and add jsp-2.1-6.1.14

* Determine if principal is empty in getJdbcUrl method
2019-08-21 20:11:13 +08:00
lgcareer
f9c0800898 [maven-release-plugin] prepare for next development iteration 2019-07-18 17:20:59 +08:00
lgcareer
4674d939b0 [maven-release-plugin] prepare release 1.1.0-preview 2019-07-18 17:20:30 +08:00
lgcareer
bd30d48c4f [maven-release-plugin] prepare for next development iteration 2019-07-16 14:32:45 +08:00
lgcareer
d44425362d [maven-release-plugin] prepare release 1.1.0-preview 2019-07-16 14:32:19 +08:00
lgcareer
32c6666c28 [maven-release-plugin] prepare for next development iteration 2019-07-16 11:27:36 +08:00
lgcareer
94862f6d51 [maven-release-plugin] prepare release 1.1.0-preview 2019-07-16 11:27:09 +08:00
lgcareer
900379a74f [maven-release-plugin] rollback the release of 1.1.0-preview 2019-07-16 11:18:50 +08:00
lgcareer
9c9310d188 [maven-release-plugin] prepare release 1.1.0-preview 2019-07-16 11:16:41 +08:00
ligang
e2f73b715b [maven-release-plugin] prepare for next development iteration 2019-07-09 15:14:27 +08:00
ligang
964ea73e98 [maven-release-plugin] prepare release 1.1.0-preview 2019-07-09 15:14:00 +08:00
ligang
3916f46382 [maven-release-plugin] prepare for next development iteration 2019-07-08 14:38:19 +08:00
ligang
18f3eabb0c [maven-release-plugin] prepare release 1.1.0-preview 2019-07-08 14:37:46 +08:00
ligang
57383b9771 [maven-release-plugin] rollback the release of 1.1.0-preview 2019-07-08 14:31:04 +08:00
ligang
8ef2cf99d1 [maven-release-plugin] prepare release 1.1.0-preview 2019-07-08 14:29:02 +08:00
ligang
f958bb32b2 [maven-release-plugin] rollback the release of 1.1.0-preview 2019-07-08 14:16:05 +08:00
ligang
5b01837d50 [maven-release-plugin] prepare release 1.1.0-preview 2019-07-08 14:10:54 +08:00
ligang
2519d5a594 [maven-release-plugin] rollback the release of 1.1.0-preview 2019-07-08 14:05:22 +08:00
ligang
eadb230c63 [maven-release-plugin] prepare release 1.1.0-preview 2019-07-08 14:00:08 +08:00
ligang
6a1e0b3fba [maven-release-plugin] prepare for next development iteration 2019-07-08 11:05:44 +08:00
ligang
050162a3da [maven-release-plugin] prepare release 1.1.0-preview 2019-07-08 11:05:17 +08:00
bao liang
ba431dbff2
Merge pull request #487 from analysys/branch-1.0.2
merge for 1.0.4
2019-06-26 10:28:18 +08:00
ligang
8f070a9240 [maven-release-plugin] prepare for next development iteration 2019-06-25 13:52:05 +08:00
ligang
63dd1f8c07 [maven-release-plugin] prepare release 1.0.4 2019-06-25 13:51:38 +08:00
lenboo
5d9063c530 Merge branch 'dev' of https://github.com/analysys/EasyScheduler into dev-up
# Conflicts:
#	escheduler-alert/src/main/java/cn/escheduler/alert/utils/MailUtils.java
#	escheduler-alert/src/main/resources/alert.properties
#	escheduler-api/src/main/java/cn/escheduler/api/controller/SchedulerController.java
#	escheduler-api/src/main/java/cn/escheduler/api/controller/TenantController.java
#	escheduler-dao/src/main/java/cn/escheduler/dao/mapper/UserMapperProvider.java
2019-05-30 14:19:32 +08:00
ligang
9d943bdc89 [maven-release-plugin] prepare for next development iteration 2019-05-27 10:57:57 +08:00
ligang
4b929f9501 [maven-release-plugin] prepare release 1.0.3 2019-05-27 10:57:41 +08:00
lidongdai
dc55de4e86 1.0.2文档发布 2019-05-15 15:38:46 +08:00
dailidong
5a8c8ef943 1.0.2文档发布 2019-05-10 11:05:12 +08:00
Baoqi
fd26ed8291 close #106 support to store resources in s3a(support aws s3 & minio) 2019-05-09 12:16:59 +08:00
chgxtony
958556e61b upgrade spring-boot to 2.1.x and spring to 5.x 2019-04-29 14:09:09 +08:00
ligang
2c4c4cc0c0 [maven-release-plugin] prepare for next development iteration 2019-04-26 20:10:33 +08:00
ligang
5f396232d6 [maven-release-plugin] prepare release 1.0.2 2019-04-26 20:07:39 +08:00